Bug 847310 - More bustage fixes. a=bustage
Bring automationutils.py up to date with the fixes from bug 808410, bug 813577, bug 850681; a=test-only