MAVEN-83 Remove original before moving merged over it
SF
MAVEN-84 FileUtil.move() doesn't act as you'd expect