Merge "Fix master/replica race condition when creating null revisions"