Merge "Added --rmdir flag to workspace remove"