Bug 1056349
Merge pull request #4552 from danmcp/master

Merged by openshift-bot
Bug 1056483 - Better error messaging with direct usage of haproxy_ctld
Merge pull request #4553 from danmcp/master

Merged by openshift-bot