Awood/877331

A fix for  877331 and for a bug in Katello where environments were not being returned with both the name and label.