Improvements to PasswordUtil

stillalex, i think some of the nullable annotations in private methods in PasswordUtil could actually be changed to notnull and we could remove the associated extra checks for those params to be null. along with some other minor improvements see attached patch. i would appreciate if you had time to take a close look to make sure, i did not introduce a regression while refactoring.