created: https://jira.spring.io/browse/XD-1504

for now, I at least factored the logic into a single method within ContainerListener to avoid the 2x duplication that existed there.