2 easy upgrades


 - https://hibernate.atlassian.net/browse/HSEARCH-1558
 - https://hibernate.atlassian.net/browse/HSEARCH-1559