Y20181205-2200
# Conflicts: # org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaCoreOptionsTests.java Change-Id: I406b6d7693cc43faf7f2365f39514b2173b92ca3
# Conflicts: # org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaCoreOptionsTests.java Change-Id: I406b6d7693cc43faf7f2365f39514b2173b92ca3