Merge branch '2022-07-01-additional-critical-fixes-and-updates'

- Update some MAINTAINERS entries, fix a regression on FIT images