1014673: Fix problem where puppet repo gets unset
Merge pull request #3111 from daviddavis/temp/20131007161549

1014673: Fix problem where puppet repo gets unset