Fix RHEL5 unit test errors 

Merge the fix for rhel 5 unit test errors forward from pulp 2.2