Ensure we pull in pip extra requirements.

It appears like the pip extra requirements
were not getting pulled in due to the override
in general.yaml so move those values to the
right distro section for said component.

Change-Id: I9532f37c8878ed71f5efd39674c2a25ce5994d14