TRUNK-2894: Renamed a few messages as requested
Merge pull request #1022 from geoff-wasilwa/TRUNK-2894

TRUNK-2894: Renamed a few messages as requested
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-2671 Cache handlers in HandlerUtil

(cherry picked from commit cc3748cf53b5415a4ffd7d8a8a5060c4baf41fc6)

Conflicts:
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
	api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
Duration term for minutes and months conflict - TRUNK-4491

Follow up to rename constants for snomed codes and hl7 code - TRUNK-4491

Follow up - TRUNK-4491
TRUNK-4495 Settings page returns 500