adapting environment commands to new structure

seen in Katello/katello#3754