Merge "Allow users with deleterevision but not deletedhistory to delete revisions"