Merge branch 'fix/generator_issues' of https://labs.etsi.org/rep/arf/world-storage-api-helpers/world-storage-asp.net-server into fix/generator_issues

# Conflicts:
#	server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/Startup.cs