CLOUDIFY-1646 Changed timeout handling to enable groovy calls to constructor