Better waiting and locking on vmadm.
Merge branch 'test' into dev