Clean out zmq references so we can run this in the SmartOS GZ
Merge remote-tracking branch 'origin/master'