Solr6273 4 6 1 cherrypicking