Sync FSX with FSFS.  Merge r1640061 from FSFS and resolve the usual naming and text conflicts.
Sync FSX with FSFS.  Merge r1640061 from FSFS and resolve the usual
naming and text conflicts.

This ports the 'svnadmin verify --metadata-only' improvements to FSX.

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

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