Hsearch 1634

Infinispan upgrade, and incorporate Gustavo's PR

https://hibernate.atlassian.net/browse/HSEARCH-1634