Fixes to the salt scheduler

[garethgreenaway]

What does this PR do?

Enable jobs scheduled on the master to fire their return data to the event bus

What issues does this PR fix or reference?

#39668

Previous Behavior

Return data from jobs running on the master was simply not returned to the event bus.

New Behavior

Return data from jobs running on the master, eg. runner, is fired to the event bus.

Tests written?

No

Please review Salt's Contributing Guide for best practices.

[ghost]

@garethgreenaway, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dmacvicar, @martinhoefling and @DmitryKuzmenko to be potential reviewers.

[garethgreenaway]

@mirceaulinic FYI, here is the PR.

[mirceaulinic]

Oh wow, that was impressively fast! Thank you @garethgreenaway. With this I learnt something new and maybe next time I will be capable to provide an eventual fix.

[mirceaulinic]

I confirm this solved the problem and doesn't seem to affect the scheduler on the minion:

__schedule_return	{
    "_stamp": "2017-06-08T20:30:00.271726",
    "cmd": "_return",
    "fun": "salt.cmd",
    "fun_args": [
        "test.ping"
    ],
    "id": "ip-172-31-11-15.us-east-2.compute.internal_master",
    "jid": "req",
    "pid": 2131,
    "return": true,
    "schedule": "schedule_my_runner",
    "success": true
}
salt/job/20170608203031690802/ret/device1	{
    "_stamp": "2017-06-08T20:30:31.691899",
    "arg": [],
    "cmd": "_return",
    "fun": "test.ping",
    "fun_args": [],
    "id": "device1",
    "jid": "20170608203031690802",
    "pid": 1925,
    "return": true,
    "schedule": "schedule_ping",
    "success": true,
    "tgt": "device1",
    "tgt_type": "glob"
}

[garethgreenaway]

Go Go Jenkins!

[garethgreenaway]

Go Go Jenkins!

[garethgreenaway]

Go Go Jenkins!

[rallytime]

👍