Remove unused imports, add missing module dependencies and fix tests.
Updates for Groovy 2.2.x - EUCA-8418
Merge branch 'dev/sjones/EUCA-8418_and_cleanup' into testing