Merged revision(s) 1651127 from lucene/dev/trunk: LUCENE-5900: Fix remaining issues with default matchVersion