Bug 845734 - Fix rebase error when applying mozilla-central patch to beta - r=bjacob a=bajaj

--HG--
extra : rebase_source : a60966d39d26166a9c0f84252c372b9342d05a48