Bug 1091113 - Don't merge obsolete entity fields
Bug 1094753 - [Costcontrol] Changing the hash value for '#' does not maintain the correct hash on the app.
Merge pull request #25637 from zbraniecki/1091113-improve-l10n-merge

Bug 1091113 - Don't merge obsolete entity fields. r=stas
Merge pull request #25878 from gitmai/bug-1094753-fix-onhashchanged-method

Bug 1094753 - [Costcontrol] Changing the hash value for '#' does not mai...
r=salva