Merge commit '2d58bd7a2d839f2871eb35856897ebcb7ead528b' * commit '2d58bd7a2d839f2871eb35856897ebcb7ead528b': librpc: Support new RPC major/minor versioning scheme.