Update requirements

* Requirements and test requirements updated to match ones
from openstack/requirements.
* Clean-up pep8 errors that appeared after requirements
update.

Change-Id: Id9a01f83d0904d82a592492abad667f42e07389b