On the 'remove-bdb' branch: Merge changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/remove-bdb@1940120 13f79535-47bb-0310-9956-ffa450edef68