Switch back to Java 1.6 to fix warnings from apache commons
Revert "Switch back to Java 1.6 to fix warnings from apache commons"

This reverts commit c34788cc9f92ea63c9b91c8e11f3bbd6e2b06a29.
Add compass for #644