Merge "deploy.sh: accept a timeout flag (-T)"