TRUNK-4301: Including voided patients in openmrs 1.11.x

Repeats above. Eliminate duplication.