No bug, Automated HSTS preload list update from host bld-linux64-spot-046 - a=hsts-update
No bug, Automated HPKP preload list update from host bld-linux64-spot-046 - a=hpkp-update
merge m-c to fx-team; a=merge

--HG--
extra : amend_source : d5fc0736172ed22bc792e03fe69d0f67531b6273
merge m-c to fx-team
Backed out changeset c9ef2c9434b5 (bug 1071164)