On the inheritable-props branch: Sync with ^/subversion/trunk through
r1395084.


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