Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:openmrs/openmrs-module-htmlformentry19ext
HTML-456 - The encounterProviderAndRole tag should not fail if there are providers whose person is voided