Merge remote-tracking branch 'upstream/master'
Remove Travis info
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.
CLOUDSTACK-5764: Some fixes to marvin
CLOUDSTACK-5925: get_*() functionality changed in marvin, changed BVT too.
CLOUDSTACK-5925: Removed incorrect import
CLOUDSTACK-5674: Some fixes to marvin and resultant changes to tests.
CLOUDSTACK-5948: Fixes to BVT test_volumes.py

1. Added a generic way of verifying isk volumes.
2. Now, detach volume is called post the assert.
3. Added a sleep post detach volume to facilitate list volumes to have some time for detach operation.
4. Added a fix for a log check.
CLOUDSTACK-5963: Fixed smoke/test_network.py
Merge remote-tracking branch 'origin/master' into marvin
CLOUDSTACK-5793: Fixed few issues related CLOUDSTACK-5973
CLOUDSTACK-6006: Remove integration folder and lib
CLOUDSTACK-5980: Fix test case failing with "Error reading SSH protocol banner" ssh error
CLOUDSTACK-5674: Few new fixes
Revert "CLOUDSTACK-5674: Few new fixes"

This reverts commit 3493f17bad3b8b57778b62d464c5e7f910351cc0.
CLOUDSTACK-5674: Few fixes
Revert "CLOUDSTACK-5674: Few fixes"

This reverts commit e6b93b0a6824a3f2845fb42596c04b348ae147e2.
CLOUDSTACk-5674: Added few misc changes to make it work.
CLOUDSTACk-5674: Added fix for CLOUDSTACK-5674