Merge branch 'master' into merge-to-cv-rework
Conflicts: app/models/katello/glue/elastic_search/package_group.rb config/routes/api/v2.rb
Merge branch 'master' into merge-to-cv-rework
Conflicts:
app/models/katello/glue/elastic_search/package_group.rb
config/routes/api/v2.rb