Clean up volumeDir containers
Merge pull request #1072 from control-center/feature/CC-193

Clean up volumeDir containers