Merged revision(s) 1692472 from lucene/dev/trunk: LUCENE-6693: Add one more parameter-pass-through #2