[merge jam] port 48447 - Fix manage.down crash

[waynew]

What does this PR do?

Port #48447

---

Note: I'm not sure if this PR is actually necessary. The original complaint was that we get this error:

Exception occurred in runner manage.down: Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/salt/client/mixins.py", line 387, in _low
    data['return'] = self.functions[fun](*args, **kwargs)
  File "/usr/lib/python2.7/site-packages/salt/runners/manage.py", line 191, in down
    ret = status(output=False, tgt=tgt, tgt_type=tgt_type).get('down', [])
  File "/usr/lib/python2.7/site-packages/salt/runners/manage.py", line 111, in status
    ret['up'], ret['down'] = _ping(tgt, tgt_type, timeout, gather_job_timeout)
  File "/usr/lib/python2.7/site-packages/salt/runners/manage.py", line 43, in _ping
    pub_data = client.run_job(tgt, 'test.ping', (), tgt_type, '', timeout, '', listen=True)
  File "/usr/lib/python2.7/site-packages/salt/client/__init__.py", line 347, in run_job
    raise SaltClientError(general_exception)
SaltClientError: Salt request timed out. The master is not responding. You may need to run your command with `--async` in order to bypass the congested event bus. With `--async`, the CLI tool will print the job id (jid) and exit immediately without listening for responses. You can then use `salt-run jobs.lookup_jid` to look up the results of the job in the job cache later.

But that's not what we see currently. We get

Traceback (most recent call last):
  File "/usr/local/lib64/python3.6/site-packages/salt/client/mixins.py", line 397, in low
    data["return"] = func(*args, **kwargs)
  File "/usr/local/lib64/python3.6/site-packages/salt/runners/manage.py", line 217, in up
    gather_job_timeout=gather_job_timeout,
  File "/usr/local/lib64/python3.6/site-packages/salt/runners/manage.py", line 101, in status
    res = _ping(tgt, tgt_type, timeout, gather_job_timeout)
  File "/usr/local/lib64/python3.6/site-packages/salt/runners/manage.py", line 44, in _ping
    tgt, "test.ping", (), tgt_type, "", timeout, "", listen=True
  File "/usr/local/lib64/python3.6/site-packages/salt/client/__init__.py", line 360, in run_job
    "The salt master could not be contacted. Is master running?"
salt.exceptions.SaltClientError: The salt master could not be contacted. Is master running?

Which is more worthwhile and actually says something. I'm inclined to say we may not need this port, especially since there was no original issue, just the PR.

[dwoz]

Closing this due to inactivity. Anyone should feel free to re-open it if they want to see it through to the end in one release cycle.