Merge pull request #366 from pulp/barnabycourt-2.2-build-breaks

Fix RHEL 5 unit test errors by removing dependencies on common models
Merge branch 'pulp-2.2', pre-build.
Automatic commit of package [pulp-rpm] release [2.2.1-0.1.beta].
1020007 - added loading of conf file to entry point
changed json config reader import to accomodate unit test
Merge branch 'pulp-2.2', post build.
Automatic commit of package [pulp-rpm] release [2.3.0-0.27.beta].
Merge pull request #372 from pulp/jconnor-1020007-load-iso-importer-conf-file

Jconnor 1020007 load iso importer conf file
Merge branch 'master' into jconnor-new-yum-distributor