CLOUDIFY-1896 Changing back connection to be part of test lifecycle