Hi,
I think you are being affected by a feature in warrior to split mender.conf into persistent and transient parts. See this commit.
The easiest, is just to disable the feature as the first Changelog indicates.
Please let me know if this fixes your issue!
We will soon release a warrior tag, and for it we will document better this change that affects upgrading from yocto to warrior.