saltstack/salt — pull request #11247 by cachedout (2014-03-14 21:22:58+00:00)
Title: Use root_key if auth'ing as root when token is present.

Closes #11223.