Merge "UserController.shouldConfirmCredentials uses isCredentialSharedWithParent" into tm-dev