Merge pull request #8098 from crdlc/bug-company-edition

Bug 841317 - [CONTACTS][FACEBOOK] If you link a contact with company fil...(cherry picked from commit c19c8a3027881f98040fd7792621040cdbd45600)
(cherry picked from commit f80209da3b41cd726422e6b5499dd3befaa47509)