Merge #7621: Fixes ZMQ startup with bad arguments.

0040118 Fixes ZMQ startup with bad arguments. (mrbandrews)

src/zmq/zmqnotificationinterface.cpp

@@ -100,7 +100,6 @@ bool CZMQNotificationInterface::Initialize()
 
     if (i!=notifiers.end())
     {
-        Shutdown();
         return false;
     }
 

src/zmq/zmqpublishnotifier.cpp

@@ -69,6 +69,7 @@ bool CZMQAbstractPublishNotifier::Initialize(void *pcontext)
         if (rc!=0)
         {
             zmqError("Failed to bind address");
+            zmq_close(psocket);
             return false;
         }