On the 1.9.x-strict-rep-sharing branch, catch up with 1.9.x.

There was a text conflict in subversion/libsvn_fs_fs/transaction.c.
I have merged this in accordance to what was on trunk at the time
the original code was written -- trunk has since changed again.
Additional review is appreciated (and requried anyway before this
branch can be merged ;-)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.9.x-strict-rep-sharing@1794536 13f79535-47bb-0310-9956-ffa450edef68