One workaround is to drop usage of GRUB and just patch U-boot but this might require some effort if you have not it before and you would need to adjust the mender-convert scripts to this method.
I have not been involved in debugging this, and would need to spend some time to understand what is going. Something that I might be able to do during next week