Run only on jdk7 for the moment
Merge branch 'master' into i658