Bug 1028569 - Bookmarks toolbar bounces when hiding on OS X. r=jaws

--HG--
extra : rebase_source : 02cebe968612f155f86a817aa4b2a53fcf3ff43f
Bug 1022745 - Add UTM parameters to plugincheck URL. r=gavin

--HG--
extra : rebase_source : 04000ff6b7663b7d1df7d6049a6674b04d895423