Merged revision(s) 1715615 from lucene/dev/trunk: SOLR-5971: Fix error 'Illegal character in query' when proxying request