Synced with global requirements

Manual first sync with the global openstack/requirements repo. Moving
forward, these will be auto-proposed by a bot on commit to requirements.

Change-Id: I22d2d6c7fb991556ebc156fa94273a37c3e6d3c6
Merge "Synced with global requirements"