new env tests
Merge branch 'master' of https://github.com/RedHatQE/katello.auto
Env selection tests
Merge branch 'master' of https://github.com/RedHatQE/katello.auto
Added another env-selection test
Style fixes
Merge branch 'asaleh-content-search-env-compare'

Conflicts:
	src/katello/content_search.clj

Cleaned up a bit of formatting