LT-10733, improvements to homograph handling in SFM import

Change-Id: I6a899e33c3546d38844260e9543ce4efb4bf25c0