Merge remote-tracking branch 'origin/master' into jenkins-build-53

templates/loadbalancer/remoteip.conf.erb

@@ -4,14 +4,15 @@
 ###############################################################################
 
 <IfModule remoteip_module>
-    RemoteIPHeader <%= @remoteip_header %>
+    RemoteIPHeader <%= @ae_remoteip_header -%>
-    <% @trusted_proxies.each do |proxy| -%>
+    <% @ae_trusted_proxy.each do |proxy| %>
-    RemoteIPTrustedProxy <%= proxy %>
+    RemoteIPTrustedProxy <%= proxy -%>
     <% end -%>
-    <% @internal_proxies.each do |proxy| -%>
+    <% @ae_internal_proxy.each do |proxy| %>
-    RemoteIPInternalProxy <%= proxy %>
+    RemoteIPInternalProxy <%= proxy -%>
     <% end -%>
 
+
     # Use real client IP in all standard log formats
     LogFormat "%a %l %u %t \"%r\" %>s %b" common
     LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined