Bug 1024642 - Fix merge conflict from codemirror 4.2.0 upgrade r=me