Merged revision(s) 1617218 from lucene/dev/trunk: SOLR-6360: Remove bogus "Content-Charset" header in HttpSolrServer