Infinispan upgrades and cleanup

 - https://hibernate.atlassian.net/browse/HSEARCH-1678
 - https://hibernate.atlassian.net/browse/HSEARCH-1700
 - https://issues.jboss.org/browse/ISPN-4754