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

It repeats above, doesn't it? Eliminate duplication please.