HSEARCH-1476 and HSEARCH-1477

Extracted some simple issues on which I've stumbled during  the Lucene4 migration:
 - https://hibernate.atlassian.net/browse/HSEARCH-1476
 - https://hibernate.atlassian.net/browse/HSEARCH-1477

these can be applied on all branches (not related to Lucene4, but I'd love to rebase on this soonish)