Merge branch 'show-deleted-docs' into trunk * show-deleted-docs: treat deleted docs as nonexistant docs Revert "Avoid replication task crashes by imporoving timeout handling."