CLOUDSTACK-7077. Quickly attaching multiple data disks to a VM fails.
[VMware] Synchronize the tasks of disk preparation and reconfiguration of a VM with the disk.
This is to avoid attaching a disk with a wrong device number on the controller key.
CLOUDSTACK-7010: Add domain to createZones in marvin
Update to retrieve additional properties for testing.

Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
CLOUDSTACK-7081: db upgrade fixes - a) added description for cloud.volumes.iso_id field b) removed duplicated unique key "id_2" from cloud.storage_pool table
CLOUDSTACK-6468:IAM - Templates - Admin user is not allowed to edit
template and set isExtractable() paramater.
(cherry picked from commit b6617843d258d9437a17d39e698edba430768f9a)

Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
Detach disks before cleaning up of VMware worker VM.
CLOUDSTACK-7029: listCapacity fails when podid argument is specified.
Some minor fixes in simulator code
CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate
CLOUDSTACK-7079: Fixed the issue where rollback was called after commit. As well, added few null checks
fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler.
Removed invalid assertions from code. Now the MS can be run with assertions enabled (using -ea flag)
Merge branch 'master' into ovmsupport