Revert timing change #3431

The docs are aweful confusing, but it does look like this needs to be converted

salt/payload.py

@@ -146,7 +146,7 @@ class SREQ(object):
         self.poller.register(self.socket, zmq.POLLIN)
         tried = 0
         while True:
-            polled = self.poller.poll(timeout)
+            polled = self.poller.poll(timeout * 1000)
             tried += 1
             if polled:
                 break