Fix JDK 1.6 issues
Fix JDK 1.6 issues
Merge branch 'master' of https://github.com/aerogear/aerogear-forge-scaffold
Merge branch 'master' of https://github.com/aerogear/aerogear-forge-scaffold