CLOUDIFY-2540 workaround for travis
Merge remote-tracking branch 'origin/feature/CLOUDIFY-2540-blueprint-id' into feature/CLOUDIFY-2540-blueprint-id