Bug 860560: make sure that defaultEngine and currentEngine stay in sync, r=gavin

--HG--
extra : rebase_source : 2a3169621b8cedf1382d738bd67072dae77cb4ce