Merge mozilla-central to mozilla-inbound

devtools/client/netmonitor/test/browser_net_json-b64.js

@@ -23,13 +23,13 @@ add_task(function* () {
   });
   yield wait;
 
-  wait = waitForDOM(document, "#panel-3");
+  wait = waitForDOM(document, "#response-panel");
   EventUtils.sendMouseEvent({ type: "mousedown" },
     document.getElementById("details-pane-toggle"));
-  document.querySelector("#tab-3 a").click();
+  document.querySelector("#response-tab").click();
   yield wait;
 
-  let tabpanel = document.querySelector("#panel-3");
+  let tabpanel = document.querySelector("#response-panel");
 
   is(tabpanel.querySelector(".response-error-header") === null, true,
     "The response error header doesn't have the intended visibility.");