Merge "Eclipse classpath maintenance"