CLOUDIFY-2497 fix import order