Merge "CDS Swagger remove yaml files"