Update requirements.txt/test-requirements.txt

Within Havana we generally rename tools/pip-requires to
requirements.txt and tools/test-requires to test-requirements.txt.

Handle both locations gracefully.

Fix flake8 warnings.

Change-Id: I5ad03a1b7efa76e31522f5b6f0da1bb3dd8cf6bc