Final usr-merge fixes for Kirkstone 5.5

Posted a couple of days ago about aborted release of 5.5:

https://bkhome.org/news/202309/aborted-release-of-easyos-kirkstone-series-version-55.html

Seems to be sorted. Did a test update on a usb-stick, 5.4.10 to 5.5, worked. Latest commits:

https://github.com/bkauler/woofq/commits/a42363cf9fe3777942af99798f632194aab41915

Think OK to go ahead and release 5.5.     

Tags: easy