Merge "Add user type to 'user list -v' output"