infinispan/infinispan — pull request #1700 by mmarkus (2013-03-05 13:26:02+00:00)
Title: T ispn 2865 m

https://issues.jboss.org/browse/ISPN-2888
https://issues.jboss.org/browse/ISPN-2865
Please backport to 5.2.x as well.