tree 8d2c4c271c63b8e821be8d97559573d94cd4dc20
parent d94d0b37f9eeec611becb5d1b7322a8888ab330d
parent 604dcc342d181a55b03c9cf8deffb2b1b5bbe78b
author Noopur Gupta <noopur_gupta@in.ibm.com> 1612270724 +0530
committer Noopur Gupta <noopur_gupta@in.ibm.com> 1612270792 -0500

Bug 570843: Merge master branch to BETA_JAVA16 branch after M2

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