Resolves https://issues.apache.org/jira/browse/STREAMS-70
resolves https://issues.apache.org/jira/browse/STREAMS-60
updated per pull request feedback
License headers
Merge branch 'STREAMS-70'