HSEARCH-1623

 - https://hibernate.atlassian.net/browse/HSEARCH-1623
 - https://hibernate.atlassian.net/browse/HSEARCH-1625

We'll need to backport these to 4.4 and 4.5 .. WDYT?