Merge pull request openshift#1380 from pravisankar/fix-haproxy-escape-3.10

[3.10] [Backport] Correct quoting issue with Forwarded field in HAproxy 1.8

Author: ironcladlou

images/router/haproxy/conf/haproxy-config.template

@@ -359,7 +359,7 @@ backend be_secure:{{$cfgIdx}}
   http-request set-header X-Forwarded-Proto https if { ssl_fc }
   {{- if matchPattern "(v4)?v6" $router_ip_v4_v6_mode }}
   # See the quoting rules in https://tools.ietf.org/html/rfc7239 for IPv6 addresses (v4 addresses get translated to v6 when in hybrid mode)
-  http-request set-header Forwarded for="[%[src]]";host=%[req.hdr(host)];proto=%[req.hdr(X-Forwarded-Proto)]
+  http-request set-header Forwarded for=\"[%[src]]\";host=%[req.hdr(host)];proto=%[req.hdr(X-Forwarded-Proto)]
   {{- else }}
   http-request set-header Forwarded for=%[src];host=%[req.hdr(host)];proto=%[req.hdr(X-Forwarded-Proto)]
   {{- end }}