# Conflicts:
# org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
# org.eclipse.jdt.apt.core/pom.xml
# org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
# org.eclipse.jdt.compiler.apt.tests/pom.xml
# org.eclipse.jdt.compiler.apt/META-INF/MANIFEST.MF
# org.eclipse.jdt.compiler.apt/pom.xml
# org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
# org.eclipse.jdt.core.tests.compiler/pom.xml
# org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
# org.eclipse.jdt.core.tests.model/pom.xml
# org.eclipse.jdt.core/META-INF/MANIFEST.MF
# org.eclipse.jdt.core/pom.xml
Change-Id: I2c1aec46f33dc4bb57c663479e0746de047fc7ea