Merge "configstore: respect service registration status."