Merge m-c to fx-team
Bug 956716 - Use exclusive bounds for substring. r=bnicholson
Bug 985875 - Set selected item in adapter for single select lists. r=bnicholson
Bug 987310 - Sanitize the filter predicates loaded from the preferences, r=rcampbell
Bug 985555 - Fix inspector loading when browsing a tab history r=bgrins
Bug 988144 - UITour: Highlight effects don't occur if a highlight is moved to a different target with the same effect. r=Unfocused
Bug 935014 - Allows to specify the devtool debuggger port via the command line. r=fabrice
Merge mozilla-central to fx-team on a CLOSED TREE
Bug 968727 - Move common test runner parts in external helper files; r=bgrins
Bug 986481 - Expose Promise.jsm promises as a devtools loader global. r=dcamp
Bug 987457 - rename ProtoAndIfaceArray to ProtoAndIfaceCache; r=bz
NSIS installer file changes for Bug 962381 - Add support for NSIS 3.0a2. r=bbondy
Bug 985312 - PJS: Remove the bounds function from ForkJoin. (r=nmatsakis)

--HG--
rename : js/src/builtin/Parallel.js => js/src/builtin/ParallelUtilities.js
Bug 980247 - Fix silly rebase error. r=fail
Backed out changeset 636fa3174368 (bug 983910) for xpcshell failures.
CLOSED TREE
Backed out changeset 32ce387c5487 (bug 987010) for crashes.
CLOSED TREE
Bug 988507 - Upgrade SQLite to version 3.8.4.2. r=mak
Bug 987433 - DOMTokenList should have a strong reference to its owner so that the API doesn't suddenly start returning empty string. r=khuey
Bug 976692 - Add IdP caching. r=jib
CLOSED TREE
Bug 965373 - When the profiler stops it doesn't stop the EventTracer thread. r=BenWa, r=froydnj