Solr monitoring fixes

Change-Id: I26623d180e767f7536b393183ffebbc671a06352
Merge "Solr monitoring fixes" into production