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

--HG--
extra : rebase_source : ffed279ab30285d2065f45eec3de0d487f749619