Bug 917198 - en-US: inconsistent use of "OK" and "KB" across Gaia apps and settings
Merge pull request #12274 from flodolo/bug917198_master

Bug 917198 - inconsistent use of "OK" and "KB" across Gaia apps and settings, r=kaze
Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo
Merge pull request #12276 from gaye/waitForAlert

Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo a=test-only
Bug 916774 - [Clock] Rename StopwatchPanel => Stopwatch.Panel, move Timer.Panel to timer_panel.js