Port Bug 1006956, Bug 1007991, and Bug 1009359 to comm-central to fix check-sync-dirs orange. rs=bustage