Latest jdk introduced bug that caused our unit tests to fail

Merged Piotr Gawron requested to merge new-jdk-bug into master

Merge request reports