Merge "Updated from global requirements" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 2 Mar 2017 05:10:43 +0000 (05:10 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Mar 2017 05:10:43 +0000 (05:10 +0000)

Trivial merge