Sync FSX with FSFS:  Merge revisions
r1631050, r1631051 and r1631186 from libsvn_fs_fs and resolve a
minor text conflict.

These are fixes to the 'changed paths list' code.

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