Merge pull request #10241 from AdmiralCurtiss/user-dir-consistency Ensure user paths are stored in a consistent manner.
