do not use java 7 class
increase timeout
increase timeout
Merge pull request #1520 from marcel-blonk/PLFM-2580a

Plfm 2580a