CLOUDIFY-1865 changed all groovy imports to point to the new class locations