Pick up more of the potential requirements/test requirements

Certain projects now have the ability to specify requirements
in a 'requirements-py2.txt' so we might as well add that to the
potential search list as well.

Change-Id: I5f7b86057d10a639185a417f067fa9bc1977b3f0
Merge "Pick up more of the potential requirements/test requirements"