LUCENE-3030: fix last nocommits

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/blocktree_3030@1158409 13f79535-47bb-0310-9956-ffa450edef68
18 files changed