Merge branch 'XD-379-378-370-Stream-Create-Dont-Start' of https://github.com/ericbottard/spring-xd into ericbottard-XD-379-378-370-Stream-Create-Dont-Start

Resolved conflicts