Merge pull request #22624 from rallytime/bp-22563

Backport #22563 to 2015.2

salt/client/ssh/__init__.py

@@ -425,6 +425,9 @@ class SSH(object):
                     running.pop(host)
             if len(rets) >= len(self.targets):
                 break
+            # Sleep when limit or all threads started
+            if len(running) >= self.opts.get('ssh_max_procs', 25) or len(self.targets) >= len(running):
+                time.sleep(0.1)
 
     def run_iter(self, mine=False):
         '''