CLOUDSTACK-7114. [EC2 QueryAPI] Inconsistency in mapping the "Allocated" state of a Volume to "Available".
Aggregate command cleanup is not required for the virtual router as we
already cleanup in the finish.

And consequently dies if somebody tries to test with assertions enabled.
Switch the catch to Throwable. Uncaught exceptions in a scheduled
threadpool executor will not report or log uncaught exceptions but will
kill the thread causing unexplained timeouts in CS.
rvr4vpc simple test for deployRouter
checkstyle: unused imports
Prevent a NPE when shutting down a network that did not have a vlan
assigned yet.
oversimplified test fixed
CS-19828: EC2 API tool errors while parsing response for detachVolume, describeAddress and revokeSecurityGroupIngress

    Changes:
    - Set the mandatory response properties in case of DetachVolume and DescribeAddress API responses
    - Use the correct CS API responsename for revokesecuritygroupingress

Conflicts:
	awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
CLOUDSTACK-4725: if storage pool has different path, but the uuid is the same, then treat them as the same storage pool
rats
CLOUDSTACK-7108: Reading provisioningtype for disk offering in base.py
I wonder if people are really interested in the location of my home folder
CLOUDSTACK-7119. [VMware] Don't allow VM reset when VM has snapshots.
Merge branch 'master' into ovmsupport