Merge "[CONTRIB] EJBCA ServiceMesh compatibility"