More porting adjustment for CiscoRouterPlugin, RPC changes