Updated from global requirements

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