Bug 865273 - [sms] Utils.Template shouldn't throw an exception when ID isn't found. r=julienw
Merge pull request #9383 from gnarf37/utils-template

[865273] Fix for Utils.Template to not throw on non-exisiting-id r=julien
Merge pull request #9464 from gaye/bug-864398

Revert "Merge pull request #8875 from gaye/bug-830180"
Bug 865091 - Enable systemXhr so youtube bypasses CORS. r=daleharvey
Add sinonjs support to test agent