Merge "Reconfigure haproxy to use dns resolution"