Updated from global requirements
Updated from global requirements

Change-Id: I6ce69e8681b93684668a13732202e721c012a497

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