CRM-13165 - Facilitate validation fixes in CiviHR