Cherry pick Sue's sync configuration changes, so develop matches the fine-grained-durability branch.