CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean
    injection.

(cherry picked from commit 31e250a9d2adbf9ee59da66073497e38c02ded86)
CLOUDSTACK-6854: Fix inconsistent IPv6 address formats

fc00:0003:1373::0002 should be treated the same as fc00:3:1373::2.
(cherry picked from commit dfe20f34f2e72335586b0e014ba1f91aa4ed473e)
Changed logic for copying snapshot from S3 to NFS staging store to prevent needless failure.

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 736bf540e8ef759a101d221622c64f3b3c3ed425)
CLOUDSTACK-6923: Fixed issue in lbsticlbsticlbrule with lbrule id

(cherry picked from commit a195e50ae7da4b4392844e2984823c1331ca1396)
CLOUDSTACK-6444: Fixing the issue with iSCSI path Format /targetIQN/LUN.

Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 24401e0b2b575d1aa151dbf5d4e0e0e1de4e9361)
CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
private
(cherry picked from commit 018b471ad300ea0987e52d6b42dde71387de8c5b)
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
(cherry picked from commit 3268f5bd1f2175ccd919ee7195d69b05d5b3f3e2)
CLOUDSTACK-6747: call a more forgiving test on the supplied peer
cidr-list
(cherry picked from commit 17850c7aff432a504d65a34d2f22ca7e1952a770)
Allow for length of password on VMs to be set via global settings

(cherry picked from commit 96412e3e58fd1ced9d269e4552aaa6410bedf556)

Conflicts:
	setup/db/db/schema-430to440.sql
remove unused import

(cherry picked from commit 2bb12f2a85c8497a15cd7b17099aefbd7c486f9b)
Submitted on behalf of Vetri for Review Request 23008
(cherry picked from commit 9c2e6f5ed45522ff68131556028f3fb4ff91ee90)
CLOUDSTACK-6453: [GPU] Windows 2012 Server instance created with vGPU offering is not coming up after installing PV drivers.

(cherry picked from commit dc22566c642e400014332045a224e5545d33a11c)
CLOUDSTACK-6884: List Capacity API always returns GPU capacity also even if type is different.

(cherry picked from commit 48646ae186eb75052da3da385404a823bd785444)
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 75aa243d1ea64493b70e9d8466d96c4842dfdf1a)
Revert "CLOUDSTACK-6935 refactor StoragePoolAllocator#filter logic"

This reverts commit 99dd86e588fd28dedd5fb3b830297a8a4f885760.
CLOUDSTACK-3540: Fix edithosts.sh on matching tag

(cherry picked from commit 46f2b61374c2012bca251c1de58fb1250e50b755)
CLOUDSTACK-7005 - Failed to start MS with latest 4.4 RPM builds

(cherry picked from commit f7417d622a15c9ff6a5d6e5e7284bd220bc647ee)

Conflicts:
	setup/db/db/schema-430to440.sql
edit checkstyle pom on rc creation
CLOUDSTACK-6997: Increase proc ip_conntrack_max

(cherry picked from commit 004d616322ba55d83407545f5b10c95ce48f75b5)
Fixing an i18n issue related to label.cache.mode

(cherry picked from commit 76930f6eab01d8659b71e5753111de52eca73b5b)