Fix check_solr

Change-Id: I8e46d658d7fc2da8f38dfccc8839f6b6f930474a
Merge "Fix check_solr" into production