TRUNK-4441 Migrate getDrugs to use LuceneQuery
TRUNK-4020: AddressTemplate should let a user specify required fields
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-2224: Show appropriate notification message when void reason is empty when voiding a patient
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
updated visits.encounterTypeToVisitTypeMapping value in the database

added preconditiion to changeset

changed preconditions

removed dbms
Merge pull request #1042 from pmuchowski/TRUNK-2224

TRUNK-2224: Show appropriate notification message when void reason is em...
Merge pull request #1032 from pmuchowski/TRUNK-4020

TRUNK-4020: AddressTemplate should let a user specify required fields
Merge pull request #1029 from rkorytkowski/TRUNK-4441

TRUNK-4441 Migrate getDrugs to use LuceneQuery
TRUNK-4441 Increased search index version
TRUNK-4307: Added error message in implementation id form

Added validator for ImplementationId.java, ImplementationIdValidator.java,
so that validation can be conducted all at once and then reported back to the user.

Added OpenMRS lincense and @should for unit test
 MarshallException while trying to create an Encounter - TRUNK-4248
author:lluismf
Merge pull request #1033 from geoff-wasilwa/TRUNK-4307

TRUNK-4307: Added error message in implementation id form