Updated from global requirements

Change-Id: I68c82bad234e38fa48ccee9db83805fcdac71ec7
Merge "Updated from global requirements"
Merge branch 'master' of https://github.com/openstack/horizon