BATCH-1946: Signs of failed merge in HibernateItemWrite (and others?)
Merge pull request 149 from chrisjs/BATCH-1946

* BATCH-1946:
  BATCH-1946: Signs of failed merge in HibernateItemWrite (and others?)