Fix nocommit. Flush needed to be for single index.
More tweaks to get tests always passing
Add assumption for lucene version difference
Sync with master.