Merge "Updated from global requirements"
authorJenkins <jenkins@review.openstack.org>
Tue, 23 May 2017 00:09:56 +0000 (00:09 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 23 May 2017 00:09:56 +0000 (00:09 +0000)

Trivial merge