Merge "servicemanager: Overwrite old service when a new one is registered" into rvc-qpr-dev