removed Integer and Long instantiations

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
removed redundant Integer instantiation in GenericDaoBase

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
change below file names for consistency

Xenserver625Resource.java  ->  XenServer625Resource.java
Xenserver625StorageProcessor.java  ->  XenServer625StorageProcessor.java
Revert "change below file names for consistency"

This reverts commit f8996fe837cd7906359652f327267fe6201d2407.
CLOUDSTACK-6170 (VMware root-disk support for managed storage)
CLOUDSTACK-6303 [Automation] [UI] Account creation hang in UI

Changes:
- Caused due to a MySql error during 'Project' account cleanup. The MySql error hits a deadlock bug in the MessageBus code that does not release the lock/decrement the counter Eventually all callers on the MessageBus end up waiting to enter
- This fixes the account cleanup MySql error.
CLOUDSTACK-6305: protect lock leaking from unhandled exception
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 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

Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
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.