AS7-6368:  validate-on-match setting is not honored when specified in the datasource subsystem

Proposed patch for AS7-6368