fixes #6669 - after lifecycle environment and content view are selected, default to associated puppet environment but have option to change it

includes commit from PR #4452