Change timeout on frame to shorter for normal usage
Merge remote-tracking branch 'upstream/develop' into sam_call1

Conflicts:
	salt/cli/caller.py
Fix lint errors
From future must be first import
Added back import that was removed incorrectly by someone else
Reverted method as superclass not have correct one mistake which superclass
Merge pull request #17697 from SmithSamuelM/sam_call1

Support for Raet Multi Master Salt Call when no local minion
Resolve related pylint errors
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was