The main difference is that ping now reports icmp_seq instead of icmp_req, so we match for icmp_.eq, which works with both releases. tcpdump now also reports port 4500 as ipsec-nat-t.
By consistently using the `expect-connection` helper we can avoid pretty much all previously needed calls to sleep.