Merge pull request #1619 from akoeplinger/flaky-dataflow-test