Non-pretty config for solr

Change-Id: I5dc6f004b80206ba39f301a44e17d85aef3a342b
Merge "Non-pretty config for solr"