wait for client/server from previous deployment to terminate

[jtaleric]

Currently, we check for the deployment, and proceed (regardless of the state). Instead we should determine if the existing deployment is terminating, and if so, wait for it to terminate.