961780: Support content_view_id for repositories action
961780: Fixing product list by removing environment option