Bug 880558 - Uplift addon-sdk to firefox r=me
Bug 860560: make sure that defaultEngine and currentEngine stay in sync, r=gavin

--HG--
extra : rebase_source : 2a3169621b8cedf1382d738bd67072dae77cb4ce
Bug 854478: remove support for automatically converting Sherlock-format search engines that were dropped into the profile directory, r=MattN

--HG--
extra : transplant_source : 2%EBl%CE1W%3E%A2%B3JK0%10M%0B%AF%87%C5H%AB
Bug 862143: remove support for loading sherlock files from disk, r=MattN

--HG--
extra : transplant_source : %0D%EC%3F%1E%1At%B5%23J%1F3V%F4%C8Uq%93l%F0%40
Test case for bug 880724
bug 868599 - update gaia.json with repo_path. r=jgriffin