Merge branch 'libradsec-add-avp-2' into libradsec