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.