Don't generate minion id by default
Have the minion actually generate its ID
Merge pull request #7739 from basepi/minioncaching

Make sure the minion ID is not guessed except by the actual minion