...and avoid SolarMutex deadlock when joining FactoryLoader threads

Change-Id: I6ae206d18dc03f99739ea20c72853db9662924d2