#2893: Run tests as Vsite manager.
Merge branch 'SCHOLAR-3.x' into 2951