* pluto: clarify Commit Flag log message
*testing : swan-prep creates OUTPUT/<hostname>.pluto.log with right
permissions
* testing :  fixed sed line Restart=no
Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan
* pluto: Log out own vendorid as "received" instead of "ignored"
* starterwhack: fix format string in starter_log() to use %d for int
* oeconns: fix format string which was missing a %s.
* pluto: added per-conn nat_keepalive=  (whack --no-nat_keepalive)

Add an option nat_keepalive= to allow disabling keep alives by
specifying nat_keepalive=no. The default (yes) causes the same
behaviour as we have currently without the option.

This option takes precedence over the global force_keepalive= option

Note: I don't fully understand the purpose of the global option, it
would send NAT-T KA packets when "they are NATed" where as normally
we only send NAT-T KA packets when "we are NATed". Is there an actual
use case for this?

To ensure we don't change the current behaviour, the whack option
does the negative, eg --no-nat-keepalives, so that not specifying it
gives the proper default behaviour of doing regular NAT-KA packets.

NOTE: We currently always send these packets, even when there is
traffic flowing over the IPsec SA (and thus over port 4500 so the
NAT router would keep the port mapping open anyway)
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan