Merge pull request #10105 from ochameau/contacts

Bug 877595 - Make mozContacts works again with the browser-helper extension r=@vingtetun(cherry picked from commit 8f5a04e02bbb6554774e55a764963094532deb80)