Merge "Add metrics (and moar logging) for when a service disables itself." into oc-mr1-dev