Fix test failure
Merge branch 'issue_17000' into develop_17000

Conflicts:
	salt/master.py
Merge pull request #17321 from cachedout/develop_17000

Re-submit of #17120