Merge "Use type horizon instead of general-service for haproxy/proxy/listen/openstack/horizon"