Forward port from Zope 2.7 branch.

The ConflictError.get_{old,new}_serial() methods each did what the other
was supposed to do.