Merge "Remove pep8 and pyflakes from test-requirements"