WIKI-917: Tests failures using JDK 7 to build (but with compiler source ...

...and target = 6)