Merge "Add dependency on HAProxy service"