Fix wome warning due to conflicting xml libraries
fix a bug in findAllChildren of domains
fix a bug in listServiceOffering with vmId
CLOUDSTACK-4624 Fixed security groups rules program issue in Advaced SG VM migration
allow Domain Admin to list usage records in the domain
CLOUDSTACK-4911 - [Mixed Hypervisor] VM Status is marked as alive when exit status of ping command is not available within command timeout

Currently during ssh execution of remote command, if no response is received within timeout, Cloudstack is returning success result.
This is resulting in false positives. Fix is to check if exit status of remote command is available or not. If not, return failure result.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
CLOUDSTACK-4910 Fixed issue with Take VM Snapshot UI always returning success
CLOUDSTACK-4894: DestroyVirtualMachine API - added "expunge" admin-only parameter. When passed as true, the vm gets expunged immediately (false by default to preserve the initial command behavior)

Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
CLOUDSTACK-3737:
Delete the uploaded volume once its copied successfully to the primary storage.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
RemoveResourceDetail API - fixed response name to be lowercase to follow the rest of CS APIs' convention
CLOUDSTACK-4493: registerSSHKeyPair API doc contains wrong API response (private key) Changing the response object of register and list ssh keypairs APIs

Signed-off-by: Koushik Das <koushik@apache.org>

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
CLOUDSTACK-4832. Added support for https to marvin.

advanced.cfg: Contains three additional flags "useHttps,certCAPath,certPath"
for https usage in marvin for establishing cs connection. We will use the
configuraiton under advanced.cfg provided by user to establish connection over
https. If establishing the connection over https failed, then the default certs
will be used.  or else raise the exception, the existing http will work as it
is when useHttps flag set to "False"

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
marvin: a1b979da8 breaks formatting and pep8.

setup/dev/advanced.cfg is used by the simulator deployments that are
usually not https. disabled the http within this config file.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Bug 4071 - Fixed Typo In Default Text
The code module represents enum for constant comparison

This module provides facilitation to use uniform codes across various test
features. Users can import this  module and use these codes to maintain
readability and one point of change.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
CLOUDSTACK-3583: Fix for Management server stop is not removing the PID
CLOUDSTAC.K-4923: add missing Network limits in Accounts details page
CLOUDSTACK-4743: durning the accountCleanup, never attempt to release the public ips when the guest networks of the account failed to cleanup
Cleanup formatting on index.jsp, to comply with indentation standards