Renaming PlainTextPassword to only Password.
Merge remote-tracking branch 'upstream2/master'