Merge pull request #4535
c4a321f Add peerid to getpeerinfo to allow correlation with the logs. (Gregory Maxwell)