Recent commits has added new variables and changed the default
for server-id, which caused the patch in rdiff to no longer apply.