Bug 864098 - Add "Disable Cache" to options panel r=jwalker

--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.html => browser/devtools/framework/test/browser_toolbox_options_disable_js.html
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs.js => browser/devtools/framework/test/browser_toolbox_options_disable_js.js
rename : browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html
merge mozilla-central to fx-team
Backed out changeset 812c5f165aca (bug 864098) for XPC Bustage on a CLOSED TREE

--HG--
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js.html => browser/devtools/framework/test/browser_toolbox_options_disablejs.html
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js.js => browser/devtools/framework/test/browser_toolbox_options_disablejs.js
rename : browser/devtools/framework/test/browser_toolbox_options_disable_js_iframe.html => browser/devtools/framework/test/browser_toolbox_options_disablejs_iframe.html
Bug 947839 - The top green border of a "highlighted" tab doesn't extend over the margins like "selected" tabs. r=bgrins
Bug 950739 - Don't scroll toolbox on raise. r=robcee
Bug 926014 - Fix styleeditor actor on b2g. r=paul
Bug 948324 - DevTools Themes: Remote connection screen does not have devtools text input styling;r=past
Bug 947281 - Fix calcuations for how many actionbar items to show. r=sriram,margaret
Bug 945251 - Remove orange highlight in reader mode buttons. r=wesj
Bug 921804 - Show checkboxes at the bottom of prompts. r=mfinkle
Merge fx-team to m-c.