fix for bind conflict on haproxy for apache and novncproxy
Merge branch 'compressed-ha' of https://github.com/CiscoSystems/puppet_openstack_builder into compressed-ha