Merge "Removing portal schema from configmap"