TRUNK-4095

https://tickets.openmrs.org/browse/TRUNK-4095  Fix Validators to compare by uuid when checking for duplicates