Refactor deploy script a bit; make it less sensitive to transient errors
we don't care about.

No issue #