Adding exlicit containment and using certname for environment
reverting agent.pp to master version for merge
Merge pull request #432 from joshsamuelson/windows_classroom

Adding explicit containment and using certname for environment