Merge pull request #20516 from KevinGrandon/bug_1021401_edit_search_term

Bug 1021401 - Can't Edit Search Term in Rocket Bar
Bug 1022053 - Add notification of search provider configuration. r=kgrandon
Bug 1022053 - Fix capitalisation of OK. r=me