Merge "Bug 2157 - Race condition when adding a RPC implementation with an output"