CLOUDSTACK-6181: Merge of resize root feature (resize-root branch)
Change newly added details map for deployVirtualMachine to an empty
map, instead of passing all possible keys as empty values
now fix MY root resize test, which passes 0 in one test...
CLOUDSTACK-5432: potential bugs in case of stop mgt server while
template is downloading, template_store_ref has leftover not in ready
state, when create vm from that template, the code doesn't check either
zone id, nor template_store_ref state.

Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
checkstyle: trailing spaces
checkstyle: unused import
Fix a regression caused by IAM search criteria refactor on VPC.
Per contrail implementation, CS ingress policy mapping: rule cidr should be mapped to src net, dst net is 'local' i.e same as 'guest network' on which rule is applied

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
cloudbyte storage plugin for master commit
pump the version
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
Work done for network offering.
Fix incorrect context being passed to hosts->instances section

Fixes issue where, if an action is being performed from the quick view in the
'Instances' section, the old context will be passed when viewing instances in
the 'hosts' section, causing all instances to be displayed. This was caused
by the quickview tooltip still being in the DOM, even after closing it by
clicking an action.
add apache licence header for cloudbyte
avoid mysql lock-promotion situation.
Let VMSync be aware of HA take-over on VM state management.
Fix style-check issue after cherry-picks
Refactor listNetworks logic to use new IAM model.
CLOUDSTACK-6047: Fix timeout issue when try to execute aggregated commands

Add executeInVR() with timeout interface to VirtualRouterDeployer

AggregationControlCommand with Action.Finish may take longer than normal command
since it would execute all the commands in one execution, and it may result in
SSH timeout for SshHelper or other mechanism communicate with VR.

Introduce an new executeInVR() interface with added timeout period for waiting
FinishAggregationCommand to complete execution.
CLOUDSTACK-6156: removing rampart maven dependencies from awsapi

The removed dependencies don't seem to be used in code, and their
presence is causing at least some people to be unable to build awsapi
and RPM packages.

Signed-off-by: John Kinsella <jlk@stratosec.co> 1395207698 -0700