Minor changes to help with SUSE support

This is the set of (hopefully) non-controversial changes previously submitted as part of https://github.com/ceph/calamari/pull/167