Merge "Adding mount points for roles and users config"