Bug 1022064 - fix messed up test annotations
Bug 916804 - Telemetry for WebIDE. r=mratcliffe, r=paul
Bug 1042825 - Project Editor: Prevent undo from undo clearing out the file content. r=jryans
Bug 1043154 - Open Split console on ESC if the focus is inside source editor (style editor / debugger). r=bgrins
Bug 1045008 - Manage search Engine option in new tab is not working (broken) if search bar is removed. r=adw
Bug 1050745 - Don't list .sjs files as tests in sessionstore's browser.ini r=smacleod
Bug 1050683 - Add nsIAutoCompleteSearchDescriptor to UnifiedComplete. r=ttaubert
Bug 1043144 - Don't write machc bytecode file; r=mshal

When writing bytecode, Python will append "c" to the loaded filename to
produce a bytecode file. Since "mach" was being imported, this resulted
in the creation of a "machc" file.

The implementation of imp.load_module() in CPython's import.c checks
sys.dont_write_bytecode. So, we wrap imp.load_module to set this flag
when importing mach.

--HG--
extra : rebase_source : 248a2349663affee3920a0726e10818d57c6ff17
extra : amend_source : 221280da9963cf91975658144ff3011353852fee
Bug 910893 - Don't disable the try again button. r=margaret,benb
Bug 1042161 - Handle OpenH264 updates for long-running sessions. r=unfocused
Bug 1042161 - Set dummy URL for GMP addon updates for xpcshell tests. r=jmaher
Backed out changeset c61532028ee4 (bug 1050683) for timeouts in browser_urlbarAutoFillTrimURLs.js; CLOSED TREE
Bug 918309 - Import and use public domain JNI.jsm implementation; r=wesj
Bug 1048785 Part 1: Update Loop FeedbackAPIClient to allow attaching more metadata. r=Standard8
Bug 1048785 Part 2: Extend MozLoopAPI with channel, version and OS details. r=mikedeboer
Merge fx-team to m-c. a=merge

--HG--
extra : amend_source : 35bb2e9e2b827884507d4fcf12c69150baa3c4b3