Compile on Java8. Fixes #2149
Merge pull request #2156 from chrisvest/2.1-fix-build-on-java8

Compile on Java8. Fixes #2149