Make sure PATH ends with a separator before prepending
#22046
Merged
PATH ends with a separator before prepending
#22046