Merge "Correcting portal k8s configmap service names"