Bug 980972 - Report a ScriptTimeout the error and have the test deal with it. r=julienw
Merge pull request #17092 from hfiguiere/bug980972

Bug 980972 - assert if we actually timeout. r=julienw