If a conflict gets reported while handling a previously-reported conflict
on the same object, second conflict is dropped on
  conflict_serial_dict.pop()
before it is handled.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2595 71dcc9de-d417-0410-9af5-da40c76e7ee4