Fix VmTypes upgrade to 3.3.0 - EUCA-6316

VmTypes initialization now works around session leak using a temporary
Entities helper method to close the entity manager.

VmType upgrade fixes including a work around for issues with our classic
version of Groovy.

EUCA-6316
Merge remote-tracking branch 'origin/dev/sjones/EUCA-6316' into testing