CLOUDIFY-2679 - Service discovery timeout should be set through the Clou...

...d configuration