Merge #11267: rpc: update cli for estimate*fee argument rename