[JAVA7 Upgrade] Move to Long.compare
[JAVA7 Upgrade] Replace explicit type with <>
[JAVA7 Upgrade] Replace try/finally with
[TEST] Reset global cluster if tearDown failes to prevent subsequent failures