Merge branch 'master' of ssh://git.eclipse.org/gitroot/www.eclipse.org/che into che-conf-18-2