CLOUDSTACK-5674: Added Fix for CLOUDSTACK-5674,5498,5500 and other issues as
 part of cleanup
CLOUDSTACK-5925: Moved test data from testsuites to marvin/config

Also merged redundant testdata as they were found.