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

templates/loadbalancer/remoteip.conf.erb

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