refs #7442 - updating 2.0 repos for new layout
Merge pull request #41 from jlsherrill/KATELLO-2.0

refs #7442 - updating 2.0 repos for new layout