sync with new go-nsq changes