Small changes to the Password credential validation.
Merge remote-tracking branch 'upstream2/master'
Improvements to the Password Credential support for the File-based store.