Merge "Revert "Add support for gid derivation on private volumes"" into oc-mr1-dev