Bug 939598. Always call BeginTransaction before EndTransaction. r=mattwoodrow
Bug 940285 - Fix build with --disable-ion r=billm

--HG--
extra : rebase_source : 91e9640d7bd41cc5054895cfa9656c93bdc03ba8