Cleanup cmd-bot weirdness

[bkchr]

So, the initial command job runs on the actual branch. Then we change to run the cmd-run.yml on the cmd-bot branch. Last but not least we then run cmd.py either from master or from the initial pull request branch.

If we need to run cmd-run.yml from the cmd-bot branch, fine by me, but then also the cmd.py should be run from there. Also there is some commit from @alvicsam on the cmd-bot branch that isn't in master. Master should be at least the canonical source for this.

CC @Gioyik