CLOUDSTACK-6599:
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls
CLOUDSTACK-6599: Add the column in Java upgrade path since 4.2 already has the extract template/volume columns
(cherry picked from commit be765ce8680564b743a73dd360c590c0e495c204)
CLOUDSTACK-6816 bugfix: cloudstack-setup-management make /root directory's permission 0777 improperly
update vlan uris

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
AlertGenerator: Fix NPE from CLOUDSTACK-3272

There was a commit 4b89a45e571a34dff0191d501089aa9b1046bc08 on master which was
added by "root@devcloud.apache.org" with no committer signature so I cannot tell
whom to reach. In the code it looks like they forgot to initialize the static
config dao variable which is causing NPE on master. The fix simply initializes
the s_configDao with injected configDao object.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
CLOUDSTACK-6824: In case there is a failure to delete the soft link of a download url, dont bail out since there can be cases such as destroy ssvm where the soft links do not exist any more.
(cherry picked from commit 73330167228d14ea8494c9c1893627b6936626a7)
Fixed ResouceLeak on pstmtCidr in the function Upgrade430to440.moveCidrsToTheirOwnTable as reported by coverity

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
Fixed Resource leak (RESOURCE_LEAK) 11. overwrite_var: Overwriting "pstmt" in "pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ldap_configuration`(hostname, port) VALUES(?,?)")" leaks the resource that "pstmt" refers to.

Signed-off-by: Koushik Das <koushik@apache.org>
Fixed ResouceLeak on pstmtCidr in the function Upgrade430to440.moveCidrsToTheirOwnTable as reported by coverity

Fixed another leak which might occur due to outer while loop.

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 004e0cbf61e9bf29bd716c8a0d7ac2f10c57433b)
Fix CID-1219920 Dereference before null check
Fix CID-1212194 Resource like dues to left-open statements and
resultsets
Fix CID-1147052 Use try-with-resources to fix the leak
List view->Detail view: Add new parameter 'noPanelView'

Adds 'noPanelView' option for detail view connected to list view. When
specified, don't support opening the detail view in a new browser pane (i.e.,
only render quickview).
CLOUDSTACK-6701, CLOUDSTACK-6702:

1. Integrate System Seed Template into MSI Installer
2. Added progress bar status messages for custom actions at needed places.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
release branch fix
(cherry picked from commit c6e00c6825509bb56dcafea2947e89b7b9e396b3)
CLOUDSTACK-6776: Removed hard coded vlan ids from BVT test_non_contiguous_vlan.py

Conflicts:
	test/integration/smoke/test_non_contigiousvlan.py
Fix set-eclipse-profile.sh to work with mac/bsd sed.

Signed-off-by: Daan Hoogland <daan@onecht.net>
CLOUDSTACK-6843: [Automation] List listServiceOfferings api fails with NPE
Incorrect parameter name used in query building resulted in a bad sql query.
Small fix for people that have JDK 1.8 installed on MacOSX and don't bother to fix their links
List view: multi-select actions: Show loading icon during action