RFC 5996 IKEv2 liveness checking
ikev2 - unpend parent sa, rekey fixes
starterwhack: move the DPD_ACTION_HOLD default action

Set the default at the top, instead of deep down the if/else path.
some comments and minor debug changes
ikev2 liveness - Lower the minimum delay time to 1 second as suggested
testing: ikev2-liveness tests 01-04, tests restart and clear
actions for liveness enabled on a single peer and both peers
ikev2 - remove references to DPD_ACTION_RESTART_BY_PEER
ikev2 - coding style cleanups
Merge branch 'master' into ikev2-feature

Conflicts:
	programs/pluto/ikev2.c
Remove obsoleted contrib/_updown version in C
Rename auto=route to auto=ondemand

For backwards compatibility, we still accept auto=route
update auto= man page
updated changes
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
building: merged lib/libpluto/ back into programs/pluto
fixup old references to liblibreswan
testing: OUTPUT.algparse.txt was listing old stricts flag
testing: Some fixes in testing/lib/libswan

I'm still not sure if this is worth saving. A lot of tests here
are marked as skiptest (incomplete)
testing: fixes for lib/libpluto

These are worth fixing, as all the tests did run at some point, although
in their non-nss versions only.
testing: updated basic-pluto-01 output

account for fips display changes and blowfish/twofish changes