Merge "Updated from global requirements"
authorJenkins <jenkins@review.openstack.org>
Tue, 10 Jan 2017 18:45:51 +0000 (18:45 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 10 Jan 2017 18:45:51 +0000 (18:45 +0000)

Trivial merge