[wireguard/el7: 2/2] Merge branch 'el8' into el7