Merge "Add org.eclipse.core.resources.prefs and org.eclipse.jdt.core.prefs"