Merge "Allow kwargs in boot_instance_from_resource"