Merge pull request #11955 from s0undt3ch/2014.1

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