Merge pull request #17218 from SmithSamuelM/sam_call1

Salt-call with local minion available now works with Raet and multi-master