Bug 986234 - Port config.status changes made by bug 979118, r=jcranmer. CLOSED TREE