added command-line config options for rpc
Merge branch 'add-rpc-command-line-config'