Merge master to cv rework

Merging master to cv rework branch
Check the  Conflicts:
        app/models/katello/glue/elastic_search/package_group.rb
        config/routes/api/v2.rb
in
https://github.com/parthaa/katello/commit/b40fcf166e964810ecfec36887335cfbb8183286