LUCENE-5666: fix test failures

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5666@1594417 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5666: fix rewrite bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5666@1594418 13f79535-47bb-0310-9956-ffa450edef68