Propose 'r1489114, r1489116' for backport to 1.8.x.

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