CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects
CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
[CLOUDSTACK-6115] Investigate the use of TravisCI for CloudStack integration testing

(cherry picked from commit 26069aa3776ea4b634fb9d614062caa595bc0fa0)
Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4
tag to exclude test in travis
CLOUDSTACK-7418 and CLOUDSTACK-7488 - Fixed LB removal if cert is associated
schema: Add upgrade path 4.3.0 to 4.3.1 picked from 51f145b

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
schema: add Upgrade431to440 that extends 430to440

This adds an upgrade path from 4.3.1 to 4.4.0, the implementation of which
simply extends the Upgrade430to440 as there was no schema change between 4.3.0
and 4.3.1

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
DatabaseUpgradeChecker: add upgrade path for ACS 4.3.1

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CID 1237195: null deref when no project found
CLOUDSTACK-7404: Failed to start an instance when originating template has been deleted

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit c1bf7eeeeeb3bd4dad384225d411e21859cce470)
bugfix/CLOUDSTACK-7476 for 4.4 branch.

See https://github.com/apache/cloudstack/pull/15 for the pull request
that was merged to master & associated discussion.
Merge branch 'hotfix/4.4-7476' of https://github.com/schubergphilis/cloudstack into 4.4
CLOUDSTACK-6926: removed hard coded jdk dirs and setting java home using readlink and dirname

(cherry picked from commit c468228fe807c621decc5919dadae9bcbb38c753)

Conflicts:
	packaging/debian/init/cloud-usage
CLOUDSTACK-6624: set specifyIpRanges to true if specifyVlan is set to true

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
CLOUDSTACK-7393: Expunging VM immediately and removing unncessary wait in test_vpc_vm_life_cycle.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 402fc914cf4047b7faf1b1410972bb5a4ae5b29d)

Conflicts:
	test/integration/component/test_vpc_vm_life_cycle.py
CLOUDSTACK-7528: More verbose logging when sending alert fails

When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).

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

Conflicts:
	server/src/com/cloud/alert/AlertManagerImpl.java
appliance: fix newer debian iso links and checksums for debian

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

Conflicts:
	tools/appliance/definitions/systemvm64template/definition.rb
	tools/appliance/definitions/systemvmtemplate/definition.rb
CLOUDSTACK-6099 live migration is failing for vm deployed using dynaic compute offerings with NPE

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>