Merge pull request #895 from marcel-blonk/develop

Remove jdk7 dependency
done
Merge pull request #896 from john-hill/PLFM-2376

done