Sync FSX with FSFS: Merge revisions r1606142, r1606144 and r1606551 from libsvn_fs_fs and resolve a minor text conflict.
Sync FSX with FSFS:
Merge revisions r1606142, r1606144 and r1606551 from libsvn_fs_fs and
resolve a minor text conflict.

This ports an index data initialization fix to FSX.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1635500 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion