merge of new k2 securityagent support after resolving merge conflicts #893

Closed nr-swilloughby closed 6 months ago