merge of #2694 changefeeds integration test