Clean up Vm
Vm cleanup code
Ensure riggerlib version
Merge pull request #804 from psav/artifactor

Ensure riggerlib version
Merge pull request #798 from sshveta/cleanupvm

Cleanupvm