Add lockfile and kombu as requirements for keystone

Sphinx is failing to build because we do not list
lockfile or kombu in either requirements file.

Change-Id: Ic31870c283a18958cd61e51bc56ed771732ee753
Use WebOb directly in ec2_token middleware

When https://review.openstack.org/#/c/71494/ was introduced, it
forgot to change ec2_token as well. This caused errors when building
docs.

Change-Id: I051519c815ed5ae60ec07203073131db1e031e10
Merge "Add lockfile and kombu as requirements for keystone"
Merge "Use WebOb directly in ec2_token middleware"