Merge "Bug 3068 - checkRpcResponse - CancellationException" into stable/lithium