Merge branch 'rd' for XD-493 of https://github.com/tekul/spring-xd into tekul-rd
Resolve conflicts with JobDeployer