Bug 1018154 - part 1: replace blocking of security principal inheriting with onpaste handler, r=dao
Bug 1018154 - part 2: adjust tests now that mayInheritPrincipal has gone the way of the dodo, r=Unfocused

--HG--
rename : browser/base/content/test/general/browser_middleMouse_inherit.js => browser/base/content/test/general/browser_middleMouse_noJSPaste.js
Bug 1018154 - part 3: add test for URL bar javascript URI pastes, r=Unfocused
Merge mozilla-central to fx-team
Bug 1026395 - Avoid unhandled rejected promise in browser_ruleview_edit-property-increments.js. r=jwalker
Bug 1028235 - Remove additional vertical scrollbar in computed view. r=pbrosset
bug 1033013 - disable testMasterPassword, follow up to remove skip-if as well r=gbrown
Backed out changeset 1b9e9be1db29 (bug 1030277) for intermittent test failures
Merge fx-team to m-c a=merge