See if we can change this to be EC2AbstractSlave class, as then this would work properly for both OnDemand slaves and Spot slaves.