Fix typo
CLOUDSTACK-4802: Change VM start flow to better support VM snapshot on certian version of vSphere, (vSphere 5.0 Update 2). If we detect that VM has pending VM snapshot, we will fully honor VM disk info from vCenter, since in some version of vSphere (vSphere 5.0 U2) does not allow disk-editting when VM has pending snapshot.
CLOUDSTACK-3101:
fix listVolumes to not display volumes to the normal users with forDisplay=false. But display volumes to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
Check for null just in case

This code was recently switched from using HashMap to ConcurrentHashMap.
ConcurrentHashMap does not accept null keys and will through a NPE.  Adding
a null check just in case somebody passes null.
CLOUDSTACK-3101:
fix listDiskOffering to not display offerings to the normal users with forDisplay=false. But display them to ROOT Admin irrespective of the flag.
Added display flag in the updateVolume/offeirng commands
Signed off by : nitin mehta<nitin.mehta@citrix.com>
CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable.
Add license header
CLOUDSTACK-4262: Fix TestVPCNetworkGc.test_01_wait_network_gc

As per the test plan, after waiting for network gc
LB rules should be cleared. Added that check instead of router
being in stopped state.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit abdb84bb05abc9f2bd102bca1c1b34865f34d771)
CLOUDSTACK:4537 - Fixed shared network and vpc test cases

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Fix vmware code inclusion into systemvm.iso and other random nonoss->noredist
Addded back Agent Load Balancing functionality (was temporarely disabled in master by vmSync merge)
CLOUDSTACK-4796: UI > Instances > detailView > add new action "Assign Instance to Another Account".
CLOUDSTACK-4672: UI > Network > details tab > add new field "broadcasturi" to show Primary VLAN, Secondary Isolated VLAN.
Added storage_provider_name to storage_pool_view

Signed-off-by: Edison Su <sudison@gmail.com>
UsageManagerInternal fix

aed5e9dc2a6882139bc38073923be5a3bacfd9d2 seems to inroduce some typo to run

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
CLOUDSTACK4515: UI > Settings tab of zone/cluster/account/primaryStorage detailView > add Description field.
CLOUDSTACK-4824:
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
CLOUDSTACK-702: 1. Moved common code to setupClass method 2. Added a test to deply vm in new CIDR and verify dns service on alias IP

Conflicts:

	test/integration/component/maint/test_multiple_ip_ranges.py

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 1efd544ee27fd0c7c9eac4649568647c0dcbc85b)
[CLOUDSTACK-4832] no cert verification on https
CLOUDSTACK-3888: UI > service offerings > compute offerings > add new field "Planner Mode".