Updated haproxy_template.conf to contain non-deprecated configuration options
Merge from hspencer77:haproxy-updated-config
Merge branch 'hspencer77-haproxy-updated-config'