Merge "Fix typo in configmap quota definitions"