Merge "Containerize HAProxy for the non-ha case"