Fixes #6010: Update build pluing to support Java 7