Fix for #464 Timeouts for /v2/deployments

Work in progress, PR created for review.