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>