[sr-dev] git:master:2372dc93: Merge pull request #2323 from voiceip/keepalive-rpc-change