Remove 'solr::decommission'; qualify 'eventlogging' include

Change-Id: I0ca09b02e8856878543a179e536f396315f36e17