Merge pull request #5174
7792040 Update comments in rpcserver to be doxygen compatible (Michael Ford)