Merge "Ensure that service_manager adds / finds make sense."