HAProxy fixes.
Merge pull request #3411 from mrunalp/bugs/haproxy_fixes

Merged by openshift-bot