LUCENE-6131: optimize SortingMergePolicy

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1647587 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-6120: Fix MockDirectoryWrapper close() handling

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