merge up to r919444

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/cloud@919455 13f79535-47bb-0310-9956-ffa450edef68