Merge branch 'master' of ssh://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.docs into task-338284