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

push changes to staging