add custom option to remove e.me and keep e.me on by default
Merge pull request #9586 from gasolin/local_custom_eme

Bug 869363 - add custom option to remove e.me and keep e.me on by default, r=tim