Merged revision(s) 1624073 from lucene/dev/branches/branch_4x: LUCENE-5934: Fix backwards compatibility for 4.0 indexes.