Add published content-view to an activation-key
merged changes from master and resolved conflicts
Add published content-view to an activation-key and made the code more readable
refactoring for update implementation
Block some permission tests, fix another
Changes to remove product from content-view
Fixed the requires entry for distributor
Merge pull request #646 from kbidarkar/fix-suite

Fixed the require entry for distributor
Merge branch 'master' of github.com:RedHatQE/katello.auto

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #629 from sghai/srecords

Add published content-view to an activation-key