Fix unit test break on rhel 5
Update cleanup script to use pip freeze instead of pip list for rhel 5 compatibility
Replace tests accidentally removed by previous commits
Merge pull request #688 from pulp/barnabycourt-2.2-build-breaks

Fix unit test build breaks on rhel 5