Treat hyphens like underscores in LuceneQueryBuilder
Add hyphen/underscore integration tests