CLOUDIFY-1808 fix imports