Merge branch 'master' of git://github.com/RedHatQE/katello.auto
Merge branch 'master' of git://github.com/RedHatQE/katello.auto
Merge branch 'master' of git://github.com/RedHatQE/katello.auto
Changes related to content-view
Conversion of Content-view-definition tests
Remove a duplicate test Content-view-definition tests
resolved merge-conflicts
updated test as per review comments
Added/modified test to update definition
changes as per review comments and added a test to remove product
Removed rest implementation
Merge pull request #581 from sghai/srecords

Conversion of content-view tests
Resolved merge conflicts on local master
fixed some merge conflicts
create composite content-view with two products
keybaord mistyping
Merge pull request #616 from sghai/srecords

Create composite content-view using two products