Merge pull request #11953 from s0undt3ch/2014.1

2014.1 Pass along global_options
Build pillar data while allowing extra pillar key/values