Removed local modification in incubator code

Now that 'rpc' module is removed from the tree, we're safe to restore
the original code here.

blueprint oslo-messaging

Change-Id: I10ee03a3e2b06cdc25bd071f3cefa06966c6ebf3
Merge "Removed local modification in incubator code"