Merge "Updated from global requirements"

latest commit d77ae8fabe

Jenkins authored Aug 4, 2015 openstack-gerrit committed Aug 4, 2015