Added a better handling of vmadm errors for create and update.
Merge branch 'test' into dev