Merge r1625533,r1625537 from trunk, use svn__apr_hash_index_key.

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