CLOUDSTACK-5614: UI - Infrastructure > Sockets > listView > (1) split "XenServer" into "XenServer 6.2.0" and "XenServer"(prior to 6.2.0).
(2) change label of Hyperv to Hyper-V.
(cherry picked from commit 81a83b5b31f0a237ae56449c60350160915f28f8)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view
Removed unused field. This will ensure that list VM queries are not blocked.
(cherry picked from commit 3fae917ebefb56ba280c2e6c5b6ff0f1720d46ed)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5960: Domain admin or user cannot register a template using
S3/Swift object store.(cherry picked from commit 6d1475182cd9ea17010a142043dd9fe9c923cf81)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5942: The agent at places logs the password of the user. It should mask the
password from the message string before writing to the log. Made a change to do so.
(cherry picked from commit 6d997bd6893f0ab649899f88456d6e80b23bb873)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5796. [VMware] Size column is not getting updated in snapshot_store_ref table when a snapshot is backed up in secondary storage.
Calculate and update the size of a backed up snapshot. This snapshot size is in turn used to update the secondary_storage count for an account.
(cherry picked from commit e8ba2d08500b582a5e2e52e694fa6d9ec89d923b)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CS-5950: Wrong storage tags are used for ISO deployed VMs.
(cherry picked from commit 1f4e2a51a42e566c11ab35cb38a81fd177feff16)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5966 Added enable/disable monitoring service in global config
(cherry picked from commit 782265e713d5eaa41ca3d6040d8994639ddbce10)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
other zones.(cherry picked from commit 77aeb2871ba393adb311f590185f2a34055c1aa1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
Findbugs finding : Incorrect use of equality

(cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6)
(cherry picked from commit f18c5a1910b6370585a1d61638b8310c3ecba5ef)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
Backport fixed for issues found by Findbugs
(cherry picked from commit 60ac12780bfa1604902a89d5dc7937a8b9334e0d)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
findbugs: null check for gateway and netmask instead of gateway twice(cherry picked from commit d30ddf6d59732fa30855811e7fe0aa639ee3849a)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
(cherry picked from commit e624632dfd532ba2885a8e7dffcb40d1436d02c1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
(cherry picked from commit 661a19bde3bf9726954f5ba88b8830f8c5a17926)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands
Backport findbugs configuration to 4.3 so we can run a findbugs report in jenkins.
nullpointer dereference guarded
moved call on static object to synchronized block
restored imports
Fix findbug issues within LDAP authenticator
Findbugs issues in ApiResponseHelper fixes