Merge "Updated from global requirements"
authorJenkins <jenkins@review.openstack.org>
Tue, 28 Mar 2017 16:35:48 +0000 (16:35 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 28 Mar 2017 16:35:48 +0000 (16:35 +0000)

Trivial merge