Merge "pbx: deadlock when outgoing dialed channel hangs up too quickly"