The change in 5.9_11 was incomplete as it did not fix broken handling of incoming connections for static links, f.e. site-to-site VPN. Import r2474 from upstream to fix it, too.
