Steve, as far as Infinispan 2LC is concerned, your wip/6.0 branch appears to be behind ORM master. E.g. HHH-11267 Closed and HHH-11304 Closed are not there.

So, I don't think I can work on top of your wip/6.0 branch until you've updated it.

I don't know which other changes in Infinispan 2LC might be missing from your wip/6.0 branch.