Merge "Updated from global requirements"
authorJenkins <jenkins@review.openstack.org>
Mon, 19 Jun 2017 14:49:41 +0000 (14:49 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 19 Jun 2017 14:49:41 +0000 (14:49 +0000)

Trivial merge