bug 848227 - generic retries. r=rail
Merge remote-tracking branch 'origin/master' into vcs_conversion

Conflicts:
	mozharness/base/vcs/mercurial.py
	mozharness/base/vcs/vcsbase.py