Merge pull request #2271 from jbeda/release-0.4-gcs-deps

Cherrypick reliability tweaks for GCE deploy