Merge "bug-fix: delete directory created by root for workspace cleanup"