Merge "Containerize HAProxy for HA"