TRUNK-4343 Unit test fails when building with java 1.8.x
Merge pull request #859 from lluismf/TRUNK-4343

TRUNK-4343