Don't remove the volume group, clean it out instead

Change-Id: Ice4470e06e08ce49a0e1f82af70abcc015c91c20
Merge branch 'skip-volumes' into dt-test
Merge branch 'fix-tempest-flavors' into dt-test
Merge branch 'fix-vg-handling' into dt-test