TRUNK-4343 

Unit test fails when building with java 1.8.x