Merge "Split out hosts config deployment"