Merge proposals dependent on lp://qastaging/~heckj/nova/rpc_refactor

lp://qastaging/~heckj/nova/rpc_refactor has no merge proposals.