Another pair of trivial changes extracted from the Lucene4 branch

Another pair of trivial changes extracted from the Lucene4 branch:
 - https://hibernate.atlassian.net/browse/HSEARCH-1479
 - https://hibernate.atlassian.net/browse/HSEARCH-1480