Add pip back to the list of grouping PMs

This is a short-term fix for an issue with Python packages
that clobber the install environment for other packages.
(cherry picked from commit c122acc222395cf24b3b24b92107d4285be59fc4)