committing Karl's latest LUCENE-6196-fixes.patch (plus my test failures) https://reviews.apache.org/r/33268/diff/raw/ WIP; tests fail