Merge remote-tracking branch 'ms/strongswan-5' into kernel-update