Namespacing Katello factories and updating duplicated factories to modif...

...y

existing ones from Foreman. Addresses the test failures introduced
by Foreman PR #1070.