Clean volume paths
Fixes #8659

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Merge pull request #8665 from cpuguy83/8659_clean_paths_for_volumes

Clean volume paths