LUCENE-4873: fix bug in MSMScorer.minHeapRemove, increase number of terms in test

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