We probably should start all this with switching the build to use JDK 8, initially w/o any other changes. Of course we would still target 1.6 to start with.