Remove jdk7 dependency
Merge pull request #895 from marcel-blonk/develop

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

done
Includes all refactoring from 7 commits.  Flattened out to help resolve conflicts that will undoubtedly occur as a result of this massive change...