Updated from global requirements

Change-Id: I577b50bc1d7ea55c4d4779d3ac55964bfb022aa9
Merge branch 'stable/havana' of https://github.com/openstack/quantum into havana/stable