HAProxy cleanup.
Merge pull request #2194 from mrunalp/dev/haproxy_cleanup

Merged by openshift-bot