TRUNK-2894: Change all void references to delete in interface
TRUNK-4484 - fixed administration instructions for SimpleDosingInstructions
Merge pull request #1034 from pmuchowski/TRUNK-2894

TRUNK-2894: Change all void references to delete in interface
TRUNK-4238 OpenmrsUtil.storeProperties should escape backslashes
Fixed formatting
Added missing comments to changesets that add concept source and terms for ISO 8601 durations - TRUNK-4446
Fixed Database upgrade test  from 1.9.7 to 1.10 to write to a test and not actual app data dir - TRUNK-4488
TRUNK-4301: Including voided patients in openmrs 1.11.x