Changes from 4.2.1 into master, excluding the revert of bug 144610

Conflicts:
	bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties