These changes are to enable analytics systemless tests. These tests run ...

...inside a virtual environment