Merge "Updated from global requirements"
authorJenkins <jenkins@review.openstack.org>
Wed, 7 Jun 2017 09:08:56 +0000 (09:08 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 7 Jun 2017 09:08:56 +0000 (09:08 +0000)

Trivial merge