Fixing import hell.
Fixes for code review on the 1.6.x version
Switch to excluding machineTypes with imageSizeGb==0 via the providesImage() predicate