Preliminary work for dual GUID (recommit)
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work
Replace hard-coded Firefox GUIDs with Pale Moon GUID
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work
Add firefox ID check to update checker + consts
Correct typo + add Firefox ID as permitted app.id in relevant checks.
Add PaleMoon entries to add-on SDK.
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work
Merge branch 'master' into guid-work

Conflicts:
	browser/app/blocklist.xml
Version bump
Fix missing click-to-play overlay on some zoom levels for plugins embedded in an iframe.
Merge branch '24.7_RelBranch'
Bug 1035551 - Add an in-tree config for marionette tests.