CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared
networks

fix ensures only admin users can delete shared network

(cherry picked from commit 2f293f42d567b1218cb083250707eeffc5324dc3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6996 Adding cluster to legacy zone failed
Lookup zone_id field in legacy_zones table to search the table for legacy zone.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

(cherry picked from commit 71f76edf71d155e14500f222d81c82ce03397dbf)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
CLOUDSTACK-6989: Add 3 strikes rule for RvR freezing detection

Sometime in VR ntpd would move time backward to keep sync with NTP server, which
can result in false alarm of keepalived monitering process.

This patch adds 3 strikes for keepalived process dead detection to avoid falsely
shutdown keepalived process due to time adjustment for only once.

(cherry picked from commit 75c9a20c7773c268c02fb006d1a7820cb427c94c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary

This new way would only enable IPv6 when VR is created in IPv6 shared network.
Otherwise IPv6 sysctl options remain disable.

(cherry picked from commit c181485ae596f49d9dfd8b78f4184ab7fcad6a8a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance

(cherry picked from commit 522208dec2f81997c8b14d820c4f3f1be958ee44)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/template/TemplateManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
CLOUDSTACK-6783: Return a proper LibvirtStoragePool object after creating the pool

In situations where libvirt lost the storage pool the KVM Agent will re-create the
storage pool in libvirt.

This could be then libvirt is restarted for example.

The object returned internally was missing essential information like the sourceDir
aka the Ceph pool, the monitor IPs, cephx information and such.

In this case the first operation on this newly created pool would fail. All operations
afterwards would succeed.

(cherry picked from commit 48899e4c815dc2db7c714db08577d253bd5e2a09)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6714: monitor script echo service command is added with quotes

(cherry picked from commit 6052a181ddddd7ca5f7c425d56d3eca55fba4aa5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
add conntrackd logrotate for systemvms, dont start conntrackd on logrotate if it isnt running

(cherry picked from commit df4a21ae3dbb8bd4dad0bdb759990e9b90a9dc09)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6578: Fixed issue in delete remote access vpn command

(cherry picked from commit 40836344de54091d795817f41a4fa136ecdb0f5d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
CLOUDSTACK-6577: Disable service monitoring in RVR

(cherry picked from commit b9b623bccc6819f4a8f96054c51ecc5d3f1db944)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
CLOUDSTACK-6516: In 4.3, SSL was turned off by default.

However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.

Local testing, checking a fresh install has the above property false by default.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
(cherry picked from commit 05802004e27f91f4c23274ca123f1ecf9fde5ac2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6467: Add pre/post-state transition status to messages published on

... event bus by UserVmStateListener. Allow system VM resource state
post-transitions to be published.

(cherry picked from commit 9c4de764f74bffd5cd547f8514d4a6897fb961c2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/vm/UserVmStateListener.java
CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting

modified:   server/src/com/cloud/api/ApiDBUtils.java

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 601827e6b34cb7debe67a8415a09440c389ba4a1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.

(cherry picked from commit 26746feb39da6483059be7b33a2d5cd41f042c78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails

(cherry picked from commit 16ab5ce76c68c2a6c813daec9cd2c90d4c5eb8c6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus

with this fix, virtual host on the AMQP server can be specified. Also
SSL can be used for connection between management server and AMQP
servers.

(cherry picked from commit bc17f177760b3b61f1df7ed9728738ffe64896d5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones

Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit 96b1c6bf3cae3c03a872770ceb420c5daef21713)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6328: added license header and removed white space

(cherry picked from commit d093a8a7b4a922773004fd501c3addde5f02810c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name".

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 085911f0a6c256c5f2a439ec0bf79b5027cdc078)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
CHANGES: updates changes files, fix cherry-picked commits that break semantics

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>