Merge "Updated from global requirements"
authorJenkins <jenkins@review.openstack.org>
Sat, 16 Jan 2016 14:19:03 +0000 (14:19 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 16 Jan 2016 14:19:04 +0000 (14:19 +0000)

Trivial merge