Fix referencing of multiple CERTREQ payload with IKEv1, other cleanups