SWITCHYARD-1975 - Fixing issue with Validator not setting schemaType