Merge pull request #7241 from rootp1/fix-rwx-pvc-resource-map-groups