Fixed failing tests in ProgramValidatorTest - TRUNK-3816
Merge branch 'master' of https://github.com/wluyima/openmrs-core