Fixes for Two published-view's of same contents
Fix expected error for bad org name tests
Fix katello.repl/trace to work with new trace lib
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 #796 from blrm/master

Organization search fix
Merge pull request #793 from kbidarkar/fix-issue788

Fixes for Two published-view's of same contents
Update some tests to reflect https://bugzilla.redhat.com/show_bug.cgi?id=975593

Note other entities SHOULD be testing name field validation as allowing any char except <>/
Katello hasn't been updated to work that way yet though.
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.
Block test
Added content-view tests to content-search
Merging uuid-s with my work-in-progress

Conflicts:
	src/katello/tests/content_search.clj
updated blockers
Merge pull request #797 from AdamSaleh/content-search-view-update

Ported final few tests that used repository promotions to use content-view promotions.
Exclude xml lib from dependency so we pick up a newer one
Change menus and org switcher locators to match katello/master
Custom information for keynames now accept the html
characters.
Fixing custom keyname test for organizations and systems.
Merge pull request #799 from omaciel/master

Custom keynames now accept html characters
Fix My Account locator
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.