Bug 952484 - [Messages][Drafts] We should not show the "replace draft" screen if the user has not changed the draft r=rwaldron
Bug 961642 - [httpd] import registerPrefix from upstream r=yurenju

import changeset from http://hg.mozilla.org/mozilla-central/rev/e840ffbba8d1