* Add a registrarId index to RegistryLock * Merge remote-tracking branch 'origin/master' into getByRegistrar * Responses to CR