MODE-2302-3.x Ported the changes for MODE-2302 to the 3.x codebase

75% of the changed files had conflicts, so there are a lot of differences (mostly syntactical though) between the code in `master` and `3.x`.

However, there is one significant semantical change around the `InfinispanBinaryStore#getAllBinaryKeys` because of the API differences between Infinispan 5 and 6. 
@hchiorean, is this what you're referring to by "semantic change"? If so, this is a good change.