small code cleanup, mostly more use of Java 7 features
avoid some false alarms for empty key test
add missing @since annotation
use latest Lucene features