check_solr, attempt 2

Change-Id: I65a14f8f0783040ff2869953fb111e72decb842c
Merge "check_solr, attempt 2" into production