Route minion errors to master

Conflicts:
	salt/cli/__init__.py
Merge pull request #19005 from cachedout/route_errors

Route minion errors to master