Conflicts:
	org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
	org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java