rolling back https://github.com/apache/incubator-streams/pull/140
to address critical test failures per STREAMS-238
STREAMS-230 should be re-opened
Auto-merge | Integrating changes from apache/master