Updated from global requirements
Updated from global requirements

Change-Id: I2ece5dcc1e0ba5654f5f12344aea3e4e5a4839a0

cwolferh/heat-scratch,openstack/heat,openstack/heat,cwolferh/heat-scratch,steveb/heat,steveb/heat,noironetworks/heat,noironetworks/heat