One more repo discovery test, also minor fix in product navigation
Merge branch 'master' of https://github.com/RedHatQE/katello.auto into new-prov
remove unnecessary provider from function
Merge branch 'master' of https://github.com/RedHatQE/katello.auto into new-prov

Conflicts:
	src/katello/providers.clj
Merge branch 'master' of https://github.com/RedHatQE/katello.auto into new-prov
Adding back a template-fn I accidentally dropped in an earlier merge
Merge branch 'master' of https://github.com/RedHatQE/katello.auto into new-prov

Conflicts:
	src/katello/providers.clj
Merge pull request #613 from blrm/new-prov

One more repo discovery test, also minor fix in product navigation