Redo refactoring to account for Mac OS X case insensitive filename

[#60062316]
Merge 60062316-mysql-dependency to master

[#60062316]