Merge branch 'master' of ssh://jchavez@git.eclipse.org/gitroot/webtools/webtools.maps.git