merging ryan and steve latest

git-svn-id: https://svn.apache.org/repos/asf/incubator/streams/branches/STREAMS-26@1574660 13f79535-47bb-0310-9956-ffa450edef68