Merge pull request #11956 from s0undt3ch/develop

Build pillar data while allowing extra pillar key/values
Allow bootstrapping a stable minion