fixes #1192.

* Adding config file option for salt master configuration
Merge pull request #11987 from toumorokoshi/showtimeout

Add show_timeout option to master config