Merge pull request #1109 from fbenkstein/enhance_write_fake_manifest

enhance write_fake_manifest.py