[sr-dev] git:master: siputils(k): port from 1.5 branch, r5880