further attempts at squashing the catalog scanning crash
use runOnQueueSync for all catalog scanning blocks
Merge pull request #1321 from pjrobertson/cfs

Further attempts at squashing the catalog scanning crash