Merge pull request #1516 from marcel-blonk/PLFM-2580

Plfm 2955 table breaks when mods are made to staging
Merge pull request #1517 from marcel-blonk/PLFM-2580

do not use java 7 class
Merge pull request #1518 from marcel-blonk/PLFM-2580

increase test timeout