Merge pull request #4623
e84843c Broken addresses on command line no longer trigger testnet. (Ross Nicoll)