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

templates/loadbalancer/remoteip.conf.erb

@@ -5,11 +5,11 @@
 
 <IfModule remoteip_module>
     RemoteIPHeader <%= @ae_remoteip_header %>
-    <% @ae_trusted_proxy.each do |proxy| %>
-    RemoteIPTrustedProxy <%= proxy -%>
+    <% @ae_trusted_proxy.each do |proxy| -%>
+    RemoteIPTrustedProxy <%= proxy %>
     <% end -%>
-    <% @ae_internal_proxy.each do |proxy| %>
-    RemoteIPInternalProxy <%= proxy -%>
+    <% @ae_internal_proxy.each do |proxy| -%>
+    RemoteIPInternalProxy <%= proxy %>
     <% end -%>
 
     # Use real client IP in all standard log formats