Backport mkdir_p path fix for Manifest
Merge pull request #561 from johnnyshields/patch-1

Backport mkdir_p path fix for Manifest to 2.x branch