CLOUDSTACK-7903: Decreased minimal usage aggregation range value

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java
CLOUDSTACK-7903: Fix build regression from previous fix

The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

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

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
CLOUDSTACK-5834: got VBD statistics from RRD

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

Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
CLOUDSTACK-7595: Remove unnecessary multiply factor for job expiry

Backported using a6ee4112a54043033233334c900d9bcd1cebf157 by
Koushik Das <koushik@apache.org>

CLOUDSTACK-7595: Config parameters "job.expire.minutes" and
"job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60
Removed the unnecessary multiply factor for both the config parameters. Also
removed the duplicate entries from Config.java as these are not required

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-7360 [vmware] Add host to existing cluster fails if the cluster is using Nexus 1000v as backend for atleast one traffic type.

While adding host to existing cluster which is using Nexus 1000v as a network backend, skip validation of Nexus VSM as it was already done while adding that cluster.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
(cherry picked from commit a1d0925f902041b187f14413e91bc368f0708753)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java