As far as I can tell it is indeed merged in master and the latest promoted branch. I pulled down master after the update, which pulled down updated required files, and re ran the generate project files with the problematic directory name and it worked without issue.