CLOUDIFY-2528 fixed import placement