Merge (with resolved conflicts) from pulp-2.1 after yum perf changes and
applicability API changes