There were two patches in patches/openwrt/to-upstream directory that
were fixes of hack patch. Those of course should not be send to upstream
and should be part of that specific patch. This commit merges those
patches to that patch.