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
Using throw as in rest of the places

just to be aligned with this style
on remove of scheduler capability, we must leave it active

As if capability gets removed, we end up in undefined state.
Merge remote-tracking branch 'origin/master' into dirsupport-move-simplification