Merge remote-tracking branch 'origin/R4_2_maintenance'

Conflicts:
	tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF