Bug 1031291 - Prepare comm-central to m-c changes from bug 762358 on a CLOSED TREE. r=jcranmer