Merge pull request #518 from valentinewallace/chanmgr-keysmgr-arc-to-deref