properly fix windows paths for storage on master when using cp.push_dir and cp.push

Fixes #16433