Set both handlers to avoid calling null action
Set both handlers to avoid calling null action
Correct some issues with names and definitions
Move up to latest code for strongswan