Fix handler use_ec2_instance_id options

Pass use_ec2_instance_id attributes to options for the handler and correct  comments for the default attribute