Changelist-feature branch: merged r20284-20305 via svnmerge from trunk.



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/changelist-feature@860380 13f79535-47bb-0310-9956-ffa450edef68