solr: lint

Change-Id: I1fed3c1c597fbd437641ea3c8a2c06d4d2eb85cd
Merge "solr: lint" into production