Merge cmaj's ZapDND and specific channel status manager commands (bugs #1917, 1918)