Clean up RPC help messages (rebased)

Rebased (and pulltester-fixed) version of #3184