Create upload folder recursive and using full path.
Merge branch 'mu/006/upload-path-fixes'