CLOUDSTACK-5364: Resolving network cleanup issue in egress fw rules test cases
CLOUDSTACK-5351: Fixed a regression where shared_ntwk_vlan was not changed to shared_vlan
XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster
CLOUDSTACK-5377: Fixed test case dependency issue in snapshots test cases
 after XS host reboot, all SG rules are gone, need to check if SG rules frame is there when program  rules for VM, if not , create the SG rule frame
CLOUDSTACK-5381: Corrected code related custom host name (vm.instancename)
CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage
fix incorrect capacity issue
Revert "CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance"

This reverts commit 7c3a7fe312bb649b6e81078e4c26a93f534ce778.
CLOUDSTACK-5352:
CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering
CLOUDSTACK-5352:
CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering
fixing the test
Enhanced few features under Marvin

Added few enhancements to marvin.
Added new module for Logging Facility to marvin.
Added new Init facility to marvin.
Currently, there are multiple ways we are doing logging
Removed few unwanted logging cases.
Removed few command line switch options for logging.
The new way of logging now provides consolidated logging
under one single folder timestamped under the configured
folder path.
Removed parsing configuration from deploydata center
Added parsing,start logging and deploy as part of init
Added new error handling facility to catch unknown exception from
test cases. Currently, lot of scripts are throwing unknown
exceptions, add a handler to plugin to dump them to a file

ToDO:
Will do clean up in phase2 for this patch.
Separate deployDatacenter from creating test client.
Clean up configGenerator

Conflicts:
	tools/marvin/marvin/deployDataCenter.py
	tools/marvin/marvin/marvinPlugin.py
CLOUDSTACK-5214: create vm_snapshots if it does not exist
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
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:
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
Fixed CLOUDSTACK-5436

Fixed few RAT issues reported for new additions of files to repo.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>