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.

This reverts commit a488998d.

Ups. This should have been in master.

Let's hope that this fixes problems with kernel 4.19 compilation.

Fixes: turris/turris-os-packages#384

This reverts commit 9a6dbcd5.

Only in master

This reverts commit 10ba166e.

It is in master, not in released branch