Disable root disk size field -- not supported in backend
CLOUDSTACK-6068: set display flag to true in service/disk_offering_details tables
(cherry picked from commit aff22869cc18bcfb0845af2624fdd2afeabb3787)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6068: set display flag to true in service/disk_offering_details tables
(cherry picked from commit 1cfbfab8162b82b30d797d4805112a75cfef3ce0)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
pass isSourceNat to second ip on the same network(cherry picked from commit 5af163ff7f658c30c6d93b50ac17c9cc0c5eb8c1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6089: Implement equals() method for ResourceTagResponse
so that the java Set can properly determine if a ResourceTagResponse
is unique. This ensures we don't get duplicate resource tags showing
up any time a UserVmResponse is crafted (which can be quite often
due to the way the responses are crafted).
(cherry picked from commit 06ae23710ddc3784939bcd499b7437c13495bb88)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6089: Use resource tag's key to determine match in
equals() method for ResourceTagResponse
(cherry picked from commit ed73e3e1b30c7c49c5dbfe8f2cac3d3dac85090e)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6083 corrected firewall rule cidr load issue
(cherry picked from commit e8f93f28fc424c73156723d9b65b13c05dafc5a8)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6065: Fix NPE problem caused by the lack of context setup in threads from agent manager thread pool
(cherry picked from commit 1283919f02e2c4d2652ca18693b6cf2906b2263d)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
check for BroadcastDomainTypes on sourceNatIp(cherry picked from commit
6d0dbf59683e1878533c8c985f26f18a1d69e1c1)

Conflicts:
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
(cherry picked from commit d38a50343130f6f147e2c9c7b2e32a43f31c7e6b)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
fixing version for 4.3.0 RC
fixing the mysql client libraries dependency problem
Addon on Davids fix. Fix runtime dependency in awsapi/pom.xml. Set dependency for mysql in juniper contrail to test, as it is only required for integration testing.
BUG-ID: CS-19152
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, destroy baremetal instance fail

BUG-ID: CS-19150
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to start baremetal instance

BUG-ID: CS-19149
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, baremetal host remain in Disconnected state. But instance associated with baremetal host is running.

BUG-ID: CS-19151
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to reboot baremetal instance

BUG-ID: CS-19156
[upgrade] Baremetal 4.2.0 -> 4.3. After upgrade, unable to stop baremetal instance

reviewed-by: edison
(cherry picked from commit 3787579d2910f4882c4b2763d610293fcbc03e61)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6124: During MS maintenance unfinished work items are not cleaned up resulting in them getting repeated for every subsequent maintenance
Updating the op_it_work table entry appropriately in db once the unfinished work item is completed.
(cherry picked from commit c6a8659ac2c2c85c6f0e9fb8af11606aaa2f9a37)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6155
Baremetal agent RPM missing in spec file
(cherry picked from commit c1806bd873fe661756aeee94b25339c25f9724a5)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6154: UI > compute offerings > memory field > check if value is undefined before converting it.
(cherry picked from commit d1440217e9a44b6c12b588cbdca52daac6335d0c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6159 Fixed creating volumes(Root, DataDisk) with uuid in primary store
(cherry picked from commit b44901c059e50ae34f55a56809cda74d4c0c08f9)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6155
Baremetal agent RPM missing in spec file
(cherry picked from commit 20efa0c8a6b83c6590eab48fefac81b72b2082a9)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live storage migration of an already migrated volume fails
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
If a volume has been renamed upon migration update its volumePath to that of the new disk filename.
(cherry picked from commit c652ff45dffaafa1cb0de29103e90fe936382028)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live VM migration of an already migrated VM (with storage) across clusters fails
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
Update volume path for every volume belonging to the VM to the corresponding new disk filename.
(cherry picked from commit 8cb03ddb2387c7aebf20dc0aa011e41f227e9f68)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>