SOLR-6111: The 'deleteshard' collection API should be able to delete a shard in 'construction' state

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1597077 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5690: MultiTerms should expose sub-Terms

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