Make policies retirect locale-prefix aware
Bug 1025673
Merge pull request #2107 from sgarrity/bug-1025673-policy-l10n

Make policies retirect locale-prefix aware
[bug 1027184] Use mapbox project keys for maps display
Merge pull request #2108 from alexgibson/bug-1027184-use-mapbox-project-keys-for-maps-display

[bug 1027184] Use mapbox project keys for maps display