Merge change 4806

* changes:
  Cleanup eclipse classpath