Made NameServiceCloseHandler a handler for ContextStop