CLOUDIFY-2531 move connection_type property up to depdends_on connection
CLOUDIFY-2531 remove travis workaround
Merge pull request #165 from CloudifySource/feature/CLOUDIFY-2531-multi-instance-changes

Depends on multi instance
Merge branch 'develop' into feature/CLOUDIFY-2393-Storage-Impl-Phase-2