Merge "Update to Latest ETSI Catalog Swagger"