Fix check_solr for Nagios, not just Icinga

This split is very non-DRY and getting really annoying.

Change-Id: I4f48973f560f71ee4e2781bbcf19dbf0c4f29dfd