Merge "Handle debug tasks more robust in zuul_stream"