Updated from global requirements

Change-Id: I73e3ed03473f8475580fff053578f0e6ac6af89f
Merge branch 'master' of https://github.com/openstack/horizon