add retries to salt bootstrap download
Merge branch 'master' of github.com:jdef/kubernetes