Insight Discovery - Collector does not pick up Agent Files when exporting to cloud

Issue Summary

A Discovery Agent installed on a Laptop, might not be accessible to the Discovery Tool - so it can be configured to transfer its Scan Result file (as an XML) to a Shared location using either File Copy / SFTP.
Discovery itself may also export its Scan Result Zip to the same Location, so a Collector may pick the files up, and ship them to a Cloud instance.

While the Collector does work as expected when transporting the files to another location (e.g. File Copy - the Agent's XML file is zipped along with the Discovery Scan Result Zips), when configured to Export to a Cloud instance, the Agent's XML is ignored and kept in the Import Folder, and the Discovery Scan Result will be Imported to Cloud

Steps to Reproduce

1. Configure the Insight Discovery Agent on any Windows machine, and set up File Transfer (either File Copy or SFTP) to a shared location
2. Set up an Insight Discovery scan (e.g. a single IP) with file export to the same location as the agent (again using any available method to transport the file)
3. Configure a Discovery Collector: The Import Folder will be the shared location from 1&2 above (make sure the Collector has access to this location)
   Configure the Collector's Export with a valid Cloud Import Token
4. Once the Agent and the Discovery Tool have both sent their files over, execute collector.exe, or install it as a service

Expected Results

Both the Discovery tool and Agent scan results will be imported to Cloud

Actual Results

The Discovery Tool Zip file is deleted, after it was imported, but the Agent's XML file is still saved in the Import Directory - the Agent was not imported to Cloud

...

Workaround

Currently - no workaround is available - see conclusion here: JSDSERVER-11099