CLOUDIFY-2549 changes for testing