Fix for #464 Timeouts for /v2/deployments

Work in progress, PR created for review.
:+1: for this change.  Should probably be in a separate PR, but this is a better way.