CLOUDSTACK-6926: removed hard coded jdk dirs and setting java home using readlink and dirname
Re-enabling fixed test cases

Conflicts:

	test/integration/smoke/test_scale_vm.py
Re-enabling fixed test case test_primary_storage.py

Conflicts:

	test/integration/smoke/test_primary_storage.py
CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
private
findbugs: unit test coverage on the utils package
CLOUDSTACK-6747: call a more forgiving test on the supplied peer
cidr-list
Fix several potential issues reported by coverity.
Set the default provisioning_type to something that doesn't cause NPEs when used.
These should have been gone a long time ago
Fix typo and add the right exception to the error map.
Add provisioning_type to the devcloud offerings.
Catch possible exceptions in finally so they won't shadow the original exception.
Fix the license headers Nitin forgot.
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
Revert "CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc"

This reverts commit 218c4713ae796bcb0002f12421d24dfee9a5320f.
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage

Signed-off-by: Daan Hoogland <daan@onecht.net>
Merge branch 'master' into ovmsupport

Conflicts:
	setup/db/db/schema-440to450.sql