Merge pull request #4414 from jlsherrill/6322-env_delete
fixes #6322 - clean up puppet environment on cv delete
Merge pull request #4414 from jlsherrill/6322-env_delete
fixes #6322 - clean up puppet environment on cv delete