Backport #8485
Updated by ttereshc about 3 years ago
Fixes to backport:
https://pulp.plan.io/issues/7876
https://pulp.plan.io/issues/8377
https://pulp.plan.io/issues/8489 (this is important only together with 8377)
Cherry-pick is clean is they are performed in the order.
.