Fixes #4974 - make sure puppetmaster is set when updating the repo url
Merge pull request #3945 from iNecas/fix-non-puppet-provisioning

Fixes #4974 - make sure puppetmaster is set when updating the repo url