Handle concurrent updates while hashing passwords
Merge remote-tracking branch 'origin/master' into rehash-password-on-login
Tidy
Merge pull request #900 from sonatype/rehash-password-on-login

Handle concurrent updates while hashing passwords