CLOUDSTACK-6626: UI - fix a bug that g_userid was not declared.
CLOUDSTACK-6600: fix a bug in IAM cache in constructing cache key.
CLOUDSTACK-6617: [Automation] detach / resize volume test cases failing
with permission error.
CLOUDSTACK-6628:[Automation] Create PF rulw API failing with error
"database id can only provided by VO objects".
Fixing few issues in Multiple IPs test cases
CLOUDSTACK-6633: listVolumes should return template/iso info for root volumes
CLOUDSTACK-6627 catch exception instead of checking response

Signed-off-by: santhosh <santhosh.edukulla@gmail.com>
Signed-off-by: Daan Hoogland <daan@onecht.net>
CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs
CLOUDSTACK-6628: Fix IpAddress import typo.
Revert "CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs"

This reverts commit 348fb7bcb675f60d1a3c649a8c0af8404044642f.
CLOUDSTACK-6606: Fixed: create network offering dailog box has greyed out (not selectable) providers for the connectivity service.
CLOUDSTACK-6379: UI > fix a bug that domain admin failed to be created when current login doesn't have visibility to root domain object.
CLOUDSTACK-6647: appending instance name with custom supplied info that contains - character can break vmsync.
CLOUDSTACK-6607: Correct the result of VpcNetworkUsage

Blank or not shouldn't be used to indicate command is failure or not.
CLOUDSTACK-5501: Allow one vpn customer gateway with multiple connections

This restriction was purposely avoid confusion of VPN setup, but later found too
strictly and cause troubles for deployment. Removed after testing one customer
gateway with multiple connections.
This patch disallows deleting / modifying system defined guest OS mappings

Local env
1. Create user defined mapping
2. Delete / modify user defined mapping. Should pass
3. Delete / modify system defined mapping. Should fail

Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
CLOUDSTACK-6652 CLONE - [Automation] Vmware-  System's StartCommand failed with "NumberFormatException" while using VMware DVS

vlan id format was like "vlan://<id>" instead of just "<id>". This causes numberformatexception while converting the vlan id to integer form from string form. this was fixed for standard vswitch in bug Cloudstack-5046. now fixed for other 2 cases of dvswitch as well as pvlan.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce.
CLOUDSTACK-6668: OVS distributed routing: ensure bridge is deleted when
last VM from the VPC is deleted on a host

OVS distributed routing: ensure bridge is deleted when last VM from the
VPC is deleted on a host. This fix ensures that bridge is
destroyed.
1. list* calls are modified to take listall=True when
account and domainid is passed to conform to recent IAM
related changes in 4.4-forward
2. fixed typo passd to passwd in cloudstackTestClient.py
3. added few missing data required for tests in test_data.py
4. removed config.cfg

mend

Conflicts:
	tools/marvin/marvin/config/test_data.py
	tools/marvin/marvin/lib/base.py