CLOUDSTACK-5478: Enable publishing uuid for all the async apis in the CallContext.
The advantage would be that event publishing can pick up the uuid and publish them.
CLOUDSTACK-6170
CLOUDSTACK-6204: removing realhostip dependency

Moving default transport for console proxy, SSVM to http.

See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.

jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.

Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
CLOUDSTACK-5626: Simplifying VM Migrate code

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
CLOUDSTACK-6147: Adding first set of test caess for Dynamic Compute Offering feature

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Bug-Id: CS-19455 Add support for Hyper-v in regression test test_routers.py

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
findbugs: scope and final to mitgate possible abuse of fields
findbugs: String for Service type mismatch (plus test for dummy  data)
rat
unneeded imports removed
findbugs: output vlanids in errormessage instead of array object pointer
findbugs: null check before use of pointer
findbugs: another array pointer in error message
Fix truncation issue with refresh, add button icons
CLOUDSTACK-6170
CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state
Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java

Conflicts:
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
CLOUDSTACK-6220: Fix cloudstack init scripts so that they
don't use fully qualified path as script name. Fix for
commit 9dd57c22b02afcddb1d6c8ddc3e1b578961454e3
Merge branch 'master' into resize-root