Merge "Centralize the creation of the user system directory" into jb-mr1-dev