flowgrind: fix IPv4 test connection with IPv6 control connection
Merge remote-tracking branch 'origin/master' into next