Merge branches '380765-shared-ivycache' and 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server into 380765-shared-ivycache