Port bug 861425 to c-c to fix check-sync-dirs bustage, rs=port by build peer. CLOSED TREE