Upgrade Infinispan to 5.3.0.CR2

Also, remove logic made obsolete by this release.