Update the PK for sync aggregration records to include the data source type
Update the way we figure out the sync directory