959823 - splitting up a query for existing units by type, allowing each query to limit which fields are loaded, thus reducing the memory footprint.
Merge branch 'pulp-2.1'