HBASE-8014: Backport HBASE-6915 to 0.94

[Jean-Marc Spaggiari]

This is a very simple patch to get 0.94.x tests working with JDK 1.7.
Can any commiter have a quick look at it?

Thanks,

JM