replace import org.neo4j.kernel.impl.util.FileUtils with import org.apache.commons.io.FileUtils
Merge branch '2.0-maint' into 2.1-maint