Port config.status changes made by bug 935857, rs=ted

--HG--
extra : rebase_source : 47f5eb1bfe0b127e2bdcc229c3822c0f37e033e1