Merge "Set correct SELinux labels on new user directories"