[sr-dev] git:sr_3.0: registrar(k): gcc 2.95 compile fixes