Fix incorrect resolution of merge conflicts between bug 995730 and bug 1001542 (no bug; CLOSED TREE)

--HG--
extra : amend_source : 5b90e13f8f3a7419e26acee6e483855bdd8c3558