SONAR-5945 Improve export of components in report and fix upload