Merge "Fir haproxy configs to use with docker swarm"