1014673: Fix problem where puppet repo gets unset