Bug 1015875 - OMA CP Settings not processed correctly, settings not active by default.
Merge pull request #20103 from acperez/bug-1015875

Bug 1015875 - OMA CP Settings not processed correctly, settings not active by default. r=jaoo