Merge CHANGES from trunk, r1515237,1515992,1515997,1516023-1516024


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1516025 13f79535-47bb-0310-9956-ffa450edef68