fix bug 934472 - Allow per-template main content area
Removing unneeded compat-importants
[fix bug 998212] Privacy policy url fixed

The url for the privacy policy has changed from https://www.mozilla.org/privacy/policies/websites/ to https://www.mozilla.org/privacy/websites/

we should update it.
Merge pull request #2308 from swarnava/patch-1

[fix bug 998212] Privacy policy url fixed
Merge pull request #2307 from darkwing/remove-compat-importants

Removing unneeded compat-importants
Combine EditorConfig rules using {...} notation
Merge pull request #2312 from treyhunner/editorconfig-fix

Use shorter EditorConfig file syntax
Merge pull request #2302 from darkwing/main-content-934472

fix bug 934472 - Allow per-template main content area