saltstack/salt — pull request #8055 by basepi (2013-10-23 18:43:30+00:00)
Title: Still guess an ID always, but only cache if it's a proper minion

Fix #8052
Fix #8050