Merge branch 'master' into cdo-integration

Conflicts:
	plugins/org.eclipse.mylyn.docs.intent.markup/META-INF/MANIFEST.MF
	tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/unit/compare/IntentMatchEngineTests.java
	tests/org.eclipse.mylyn.docs.intent.compare.test/META-INF/MANIFEST.MF