CLOUDSTACK-6647: appending instance name with custom supplied info that contains - character can break vmsync.

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

Conflicts:
	api/src/com/cloud/vm/VirtualMachineName.java
NDC.pop() can return empty string, this causes a loop spinning in CallContext.UnregisterAll().

(cherry picked from commit cdf605b2cd7ccbe40b42810f8aaacb90535496db)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6463: password is not set for VMs created from password enabled template

(cherry picked from commit 2284a95e4f29b3b8634468b53d3c28395d264038)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 5d389b1a711bff0a2c7959a824e28d54b56f9e89)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java
CLOUDSTACK-6859:Management Server PermGen run out of memory after some
time due to class leak.

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

Conflicts:
	framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server.

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

Conflicts:
	server/src/com/cloud/api/ApiServer.java
CLOUDSTACK-6970: Protect event interpretion from causing NPE exception

(cherry picked from commit 06d8d3a03f7a4efc41c45d9f67fd5b7586a78454)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2

(cherry picked from commit 14f1b96b5122696df58751a2045c333989ab8392)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
FIXED CLOUDSTACK-6669 Support volume resize in usage server

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

Conflicts:
	usage/src/com/cloud/usage/UsageManagerImpl.java
CLOUDSTACK-6669: Fix support resize in usage server

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit 303e6ffc1e36a5d1ba2a1d48093f996fef1614df)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	usage/src/com/cloud/usage/parser/VolumeUsageParser.java
Fix build failure from cherry-picked commits

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Allow infrastructure to handle delete of volume from DB
(cherry picked from commit 6602ad71ac97fb1875131f41bb5f92ff1e3a1c7b)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CHANGES: add backported commits on 4.3 branch since 4.3.1 release

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-6743: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a tight loop to spin

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

Conflicts:
	framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
	framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java