SOLR-4806: Shard splitting does not abort if WaitForState times out

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