Merge "ipq807x: Fix KW issues in sysupgrade.c and cmd_bootqca.c"