Updated from global requirements

Change-Id: I3a7b913a3ab20750f6e8b048d961d66ad81dfb9a
Merge "Updated from global requirements"
Merge branch 'master' of https://github.com/openstack/tempest