Partial sync with OpenStack requirements.

Where we're using the same libraries as OpenStack, sync with the
OpenStack versions. Just to be nice.

Change-Id: I8e90d2a8945d62e962b813c6396f0e7db4e14222
Merge "Partial sync with OpenStack requirements."