Fix scoping issues with site.pp variables

corrects several scoping issues that where leading to manifest compile errors.