- Fix some merge issues due to some library version issues and lost imports.
- Fix eclipse .classpath to reflect current 3.2.x libs