# Conflicts:
# org.eclipse.jdt.core.tests.compiler/src/EvalTestsTarget.zip
# org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java
# org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java
# org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatter.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NamedMember.java
Change-Id: Ica9e9ccc4ff370554100c545310fba1c66adeed2