Merge "A few fixes for Eclipse classpath file."