Merge r17619-r17835 from trunk


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