XD-1882b: +move default from xml

Same as https://github.com/spring-projects/spring-xd/pull/986 (rebased) + an additional commit that moves the default out of the xml (and makes the tests pass)