Merge pull request #2372 from wpaulino/channelmanager-new-highest-seen-timestamp