Merge the last PGO-green inbound changeset to m-c
Merge mozilla-central into mozilla-inbound
Bug 826311 - Extend the browser_privatebrowsing_cookieacceptdialog.js to check if the cookies modal dialog appears; r=ehsan