Merge remote-tracking branch 'origin/master' into BETA_JAVA16

Conflicts:
	org.eclipse.jdt.ui.tests.refactoring/test
cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests14.java
	org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest15.java

Change-Id: If4b8e5f13de358b67a92ae7caec2d4a8aeaa8d04