Merge pull request #19093 from estesp/userns-root-rework

Allow root non-userns metadata backwards compatibility