XD-531 upgrade to reactor M3
Merge branch 'XD-531' of https://github.com/markfisher/spring-xd into markfisher-XD-531
Merge branch 'master' of github.com:SpringSource/spring-xd