Merge branch 'juno-contribution' into 380765-shared-ivycache

Conflicts:
	build.versions
	org.eclipse.virgo.repository/ivy.xml