Refactor File.expand_path usage to remove additional File.join
Merge pull request #12752 from notalex/expand_path_refactoring

Refactor File.expand_path usage to remove additional File.join