Updated from global requirements
Updated from global requirements

Change-Id: Ic17b7dc3a9d03d4893739e8d0aed3b003887f889

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