[AS7-6629] Clean infinispan references