Updated from global requirements
Updated from global requirements

Change-Id: I3df5cdada4f16ff05a27ef9be50c081335b5f17d

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