Updated from global requirements

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