Nightly build fixes, rebased against devel

There were significant changes in some of the ikev2 stuff: I didn't do them, and I don't see how the two branches diverged.  
Someone is editing files with tabs and trailing spaces.