sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
Merge pull request #19 from tiger-seo/master

sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion