Backport mkdir_p path fix for Manifest to 2.x branch