Just barely updating Infinispan to 6.0.0.Final

Cherry picking upstream changes for 6.0.0.Final proved difficult, so
this is the bare minimum.