CLOUDIFY-2679 - Service discovery timeout should be set through the Cloud configuration
Merge pull request #99 from CloudifySource/CLOUDIFY-2679-Service-discovery-timeout

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