Merge "Remove obsolete entries from .classpath"