sync-doc: add the ability to delay merging with upstream (this commit should be safe as it barely changes sync)
sync-doc: add the ability to delay merging with upstream (this commit should be safe as it barely changes sync)

sagemathinc/smc,sagemathinc/smc,sagemathinc/smc,sagemathinc/smc