'origin/master' into BETA_JAVA14
Conflicts:
org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/ImportReferencesCollector.java
org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingsCore.java
org.eclipse.jdt.core.manipulation/core
extension/org/eclipse/jdt/internal/corext/dom/ASTFlattener.java
org.eclipse.jdt.core.manipulation/core
extension/org/eclipse/jdt/internal/corext/dom/GenericVisitor.java
org.eclipse.jdt.core.manipulation/core
extension/org/eclipse/jdt/internal/corext/dom/HierarchicalASTVisitor.java
org.eclipse.jdt.core.manipulation/core
extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java
org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest13.java
Change-Id: Icffb34f0347bbfc1d3a9f35327dacb012030655f
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>