Update according to latest infinispan changes
Last tuches