Merge pull request #8472 from jmcanterafonseca/fb_connector_refactoring

Bug 845777 - Refactor FB import to use the new generic importer and conn...(cherry picked from commit 23988798926386a3f9048bddf5000c41f4d088c4)