Fix for addFile on a directory not preserving directory itself
Merge branch 'smf-addfile-dirfix' of git://github.com/YouTechnology/gradle-docker into YouTechnology-smf-addfile-dirfix
Cleanup imports
Merge branch 'YouTechnology-smf-addfile-dirfix' into dev