CLOUDSTACK-924 :
   Volumes created from snapshots misses the source template information.Fixed the issue with volumes now getting the template id.
	Signed Off by : - Nitin Mehta <nitin.mehta@citrix.com>
CLOUDSTACK-1620: getXenServer602GuestOsType -> getXenServer610GuestOsType Fixing XenServer 6.1 OS types incompatible with XS6.0
CLOUDSTACK-94: API command, listIsos documentation clarity

Updated API documentation for listIsos command.

Descriptions for id and isofilter descriptions clarified:
- Updated isofilter description with all options and verbiage taken from VirtualMachineTemplate class
- Updated id description

Signed-off-by: Chip Childers <chip.childers@gmail.com>
CLOUDSTACK-1621: listProjectInvitations fails with NPE for valid requests.
CLOUDSTACK-1615: instead of returning empty host firewall ruleset, ESXi 5.0 Update 1 may return null to indicate empty host firewall ruleset, Cloudstack needs to handle this changed behave
CLOUDSTACK-1630 - awsapi package not obsoleted, which blocked upgrades
CLOUDSTACK-1631 - removing duplicate %doc declarations in -management
updateTemplatePermissions should allow user to be able to see
templates granted permissions by another user.
commenting out docs
CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment
CLOUDSTACK-1625. NPE with updateResourceCount when && is passed thru API.
If any API contains '&' i.e. no key value pair or '&<paramter-name>' i.e. a parameter without a value, then we get an NPE as owasp.esapi.StringUtilities.stripControls deosn't handle NPE.
plugins: Add it's to cmdClass in ApiDiscovery, spring fails to self inject

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
CLOUDSTACK-1323: retire some of no-longer used files

Conflicts:
	client/tomcatconf/components.xml.in

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-1643: Check and enable Intel AES NI if available for VR

This is an encryption optimization for VPN/SSL, with upto 10x advertised speed.
The patch check for the aesni_intel module if aes is available on the cpu, this
will be true for HVMs.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
CLOUDSTACK-1644: INFRA-5977 ASFBot test

This is a fake patch for a test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-1644: INFRA-5977 ASFBot test

This reverts commit 6eade59209233f37dd8ad6768dd8b814205d7daf.

This is a second test.
appliance: While building don't just check empty arg, check if it was passed

The fix makes systemvmtemplate as the default veewee vbox appliance if not
other appliance is provided to be built

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
CLOUDSTACK-1634 VMSnapshot: CreateVMSnapshotCmd fails due to due to java.util.ArrayList cannot be cast to [Lcom.vmware.vim25.ManagedObjectReference
debian: Copy the contents of the old ~cloud directory to the new location
debian: Fix the usage server packaging