environment class additions
environment class additions
Merge remote-tracking branch 'upstream/master'
apache web server plugin prep