Fix the directory path of where the nuget packages get downloaded.
CLOUDSTACK-3190
Fix nuget package path error.
CLOUDSTACK-5416. [VMware] Not able to add seventh disk to VM in an upgraded setup.
CLOUDSTACK-5364: Fail the test incase cleanup is not successful
Moving build scripts maintained in separate repo to cloudstack repo
CLOUDSTACK-5269: Fix nose failures.
CLOUDSTACK-5413: Fixed bug CLOUDSTACK-5413
Remove the comparison between GuestOSCategoryVO.CATEGORY_NONE and guestOSCategory.getName() to make OS category of None to be a valid option.

Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
kvm: Force the default disk cache mode to none.

Not doing this caused the cache mode to be null for SystemVMs for their CDROM/ISO.
CLOUDSTACK-5145 : Added permission checks while listing network ACLs and acl Items. Users will be able to list items that they have access to.

Conflicts:
	api/src/com/cloud/network/vpc/NetworkACLService.java
	api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
make SDN GRE work with XCP 1.6
fix white-space
add two tables for gre controller
re-factor gre controller prototype
re-factor gre controller

Signed-off-by: tuna <ng.tuna@gmail.com>
tuna
tuna add port forwarding support
add kvm support & LB service
tuna