HBASE-7752 [snapshot 130201 merge] Fix TestStoreFile failure Revert change to make it match trunk and pass