Merge "Cleanup haproxy service from explicit services enablement"