Fixed bug in waiting for finished vmadm commands.
Merge branch 'test' into dev