HBASE-12156 TableName cache doesn't used for once of valueOf methods (Andrey Stepachev)
HBASE-12152 TestLoadIncrementalHFiles shows up as zombie test; ADD TIMEOUT ON TESTS
Amend HBASE-12156 TableName cache doesn't used for once of valueOf methods (Andrey Stepachev)

Fix use of diamond operator in TestTableName, we are still using
-source 1.6 for building 0.98
HBASE-12152 TestLoadIncrementalHFiles shows up as zombie test; ADD TIMEOUT ON TESTS -- Up timeout from 120 to 120000