Skarmark 954038

https://bugzilla.redhat.com/show_bug.cgi?id=954038

Mostly renaming and minor change corresponding to pulp pull request -  https://github.com/pulp/pulp/pull/457