Merge pull request #7128
02354c9 Constrain rpcport default values to a single location in code (Luke Dashjr)