Delete part of the composite content view definition and re-promote it

Covers following issues:
https://github.com/RedHatQE/katello.auto/issues/590
https://github.com/RedHatQE/katello.auto/issues/591

Also updated `promote-published-composite-view` fn to pass cv1 and cv2 as arguments.