(bug 20372) Improve rollback-revisiondelete handling