include usernameCanonical in UserManager
Merge branch 'username' into develop