Revert "Change timeout for CLI returns"
Merge pull request #16076 from saltstack/revert-15942-develop

Revert "Change timeout for CLI returns"