On the fsx branch:  Merge the latest FSX-related tests changes
(r1507729,1507731,1507735,1507736) from branches/fsfs-format7.

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