Updated from global requirements

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