Merge "Rename 'mkuser' command to 'mkuserconfig'"