Merge in vpn-encap-safis (skip compile cleanup)