Bug 980549 - Simplify SettingsManager transaction management, r=gwagner.

--HG--
extra : rebase_source : 9378c05ec7a5de6f4f692680f2d4aa08b0d32957