Merge pull request #2763 from dbalek/dbalek/fix-for-nb-javac-tests

Fixing failing nb-javac tests.