Merge branch '3.0.x' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server into 3.0.x