CLOUDSTACK-4506: fix NPE in case hostid is null

Conflicts:

	server/src/com/cloud/capacity/CapacityManagerImpl.java
CLOUDSTACK-5737: isExternalSnapshot should return true for CLVM and RBD only
fix devcloud: get back whatever we have before

Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
	scripts/vm/hypervisor/xenserver/xcposs/patch
fix devcloud router start

Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
fix devcloud: user template's guest os type is changed

Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
fix devcloud: after devcloud vm itself reboot, local storage's name label is changed to orignal
CLOUDSTACK-5395: mark snapshot_store_ref as destroyed in case of backup snapshot failed

Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
KVM security bug: no forwarding rule applied
(cherry picked from commit e5c391fcf3852e50ebd99d4a72fd51d1753b05eb)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6245: the security group rule is lagging behind the rules in DB, due to there is a worker thread launched inside a transaction Reviewed-by: Alex
(cherry picked from commit d4fdc184fe9c6717d2ed4e4fe4c39d9759a90608)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>

Conflicts:

	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
CLOUDSTACK-5264: add delta snapshot for existing xenserver

Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage

Conflicts:

	api/src/com/cloud/storage/StoragePool.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
CLOUDSTACK-5737: ignore umount secondary storage failure during backup snapshot
CLOUDSTACK-5573: bump gson version to 1.7.2, fix https://code.google.com/p/google-gson/issues/detail?id=354
CLOUDSTACK-5370: delete snapshot on primary storage in case of backup snapshot failed.
CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed.
CLOUDSTACK-5607: Don't delete the template if its stored in other zones.
CLOUDSTACK-5763: if vm is stopped, then don't check hypervisor support live storage migration capabilities.
CLOUDSTACK-5831: return quiescevm field in volumeresponse

Conflicts:

	api/src/org/apache/cloudstack/api/response/VolumeResponse.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
CLOUDSTACK-5831: Fix NPE, in case the volume isn't attached to any pool
CLOUDSTACK-5857: for some reasons, delete secondary pool failed during copy template from secondary storage to primary storage, but the volume is already copied to primary storage, we didn't clean up the volume on primary storage, then all the following copy the same template to primary storage failed, as we are always using the same uuid when creating a new volume, libvirt complaining that the volume already exists.
Current fix is ignoring "the delete secondary storage error".