Conflicts: hbase- server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java Also a minor change for TestUpgradeTo96 to replace constructor