bug 961048 - add Automation Error: to vcs failed retries. r=catlee
bug 920153 - try to fix the test buildbot timeouts. r=jgriffin