LUCENE-6005: fix sneaky auto-prefix bug, cutover more tests

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