Reverse merged r1439765 and merging r1439280 through r1439797 from trunk into verify-keep-going branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1439801 13f79535-47bb-0310-9956-ffa450edef68