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