Merge pull request #1596 from jurvis/jurvis/give-chanmon-counterparty-id