[6.15.z] Fix upload_manifest to handle case where manifest.content is not set#13834