SOLR-6123: Make CLUSTERSTATE Api unblocked and non-blocking always (Merge from trunk r1600535)

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