TRUNK-4140: Substitute deprecated method call in HibernateContextDAO
TRUNK-4490 EncounterValidator should validate presence of encounter type
Applying auto format changes
TRUNK-4529: Prevent voiding a Person linked to Provider(s) and/or User(s) metadata
Merge pull request #1205 from jbuczynski/TRUNK-4490

TRUNK-4490 EncounterValidator should validate presence of encounter type
TRUNK-4545: Fix failing tests in EncounterServiceTest
TRUNK-4307-Fix: Refactored code as recommended.

Throw APIException when ImplementationId object is null.

Added javadoc to ImplementationValidatorTest.java class

Moved @should messages to method level
Merge pull request #1135 from rpuzdrowski/TRUNK-4140

TRUNK-4140: Substitute deprecated method call in HibernateContextDAO
Merge pull request #1057 from geoff-wasilwa/TRUNK-4307-Fix

TRUNK-4307-Fix: Refactored code as recommended.
TICKET-3888:Arden patch for ArdenServiceImpl in core api to support concept names regardless of a specific language
Merge pull request #1218 from satwikreddy/TRUNK-3888

TICKET-3888:Arden patch for ArdenServiceImpl in core api to support conc...
TRUNK-4563: PatientSearchCriteria: identifier "ignoreCase()" restriction adds significant search overhead
TRUNK-4459:HTML tags are shown on merge patient page
TRUNK-4565 - Null Pointer Exception for some DrugOrders

TRUNK-4565 - andreweskeclarke - NullPointer can still happen if the DB row has a null value, replace mixed up booleans

TRUNK-4565 - andreweskeclarke - Use appropriate clone for discontinue test

TRUNK-4565 - andreweskeclarke - When comparing DrugOrder drugs during dicontinuations, check if both should be null, otherwise check both for equality
TRUNK-4562 Added since versions

(cherry picked from commit 0a953f2a51e8fac645e6a4b213008ddb2f405722)
Merge pull request #1228 from SharonVarghese/TRUNK-4459

TRUNK-4459:HTML tags are shown on merge patient page
TRUNK-4429: Add check that default locale is amongst allowed locales list