resolves STREAMS-141
Merge remote-tracking branch 'apache/STREAMS-141'