SOLR-6476

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x@1629301 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6587: Correct exception thrown on bad collection configuration in SolrCloud mode

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