Automatic merge from submit-queue

godep-save.sh: add workaround and more instructions

Fixes https://github.com/kubernetes/kubernetes/issues/48593, hit again in https://github.com/kubernetes/kubernetes/pull/47232#issuecomment-314025645.