manually merged spring-xd-dirt clean task