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