Merge pull request #13854 from crosbymichael/revert-shared-root

Revert shared container rootfs