Dang. I had another setting locally that I missed telling you about. Remove your IMAGE_BOOT_FILES setting and add the following in addition to the MENDER_FEATURES settings from above:
MENDER_BOOT_PART_SIZE_MB_mender-uboot = "0"
KERNEL_IMAGETYPE_mender-uboot = "Image"