Cleanup Eclipse project file classpath imports.
Merge branch 'master' into sql