On the dont-save-plaintext-passwords-by-default branch,
merge outstanding changes from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/dont-save-plaintext-passwords-by-default@871117 13f79535-47bb-0310-9956-ffa450edef68