Backport ISPN-3778 from infinispan master to jdg-6.3.x branch.
I could not backport this to jdg-6.3.x because it introduces a failure in LocalCacheAsyncCacheStoreTest, unless we also backport ISPN-4104 completely (because it is an indirect dependency). ISPN-4104 is currenly just partially backported to 630.
This product has been discontinued or is no longer tracked in Red Hat Bugzilla.