Merge pull request #3483 from klauskiwi/op-build-2.3.y_petitboot_fixes

Petitboot: Bump to 1.10.4 and Bring-in upstream fixes