Merge "Prevent haproxy service start up"