Merge branch 'R3_7_maintenance' of ssh://shung@git.eclipse.org/gitroot/servertools/webtools.servertools.git into R3_7_maintenance