Add changes to use python client with new ec2 and openstack metadata fields.