Merge "Change the directory for haproxy certs/keys to be service-specific"