1.9.x - Backport for TRUNK-3551: Merging persons incorrectly handles addresses and names

without saving, the repeat interval unit gets changed to seconds no
matter what it was previously - TRUNK-3759(cherry picked from commit ac9bb64)

(cherry picked from commit 34d76e2)

…rl so that"

This reverts commit b75519d.

TRUNK-3862: Unnecessary logged exceptions when saving forms(cherry picked from commit de7fd1b)

…eger length, Map<ProviderAttributeType, Object> attributes) should allow the option to include or not include retired providers

terms - TRUNK-3339

Resolved last conflict - TRUNK--3339

Removed @transactional annotation from ProviderService method -
TRUNK-3339

Fixed the @SInCE version to 1.9.4 - TRUNK-3339

module should stop - TRUNK-3738

Provider" when Adding a New Encounter - TRUNK-3344

Administration - TRUNK-3720

in the application - TRUNK-3847
(cherry picked from commit a7895e1)

TRUNK-3929(cherry picked from commit cdd0d58)

concept from the datatabase - TRUNK-3929(cherry picked from commit a9586d5)

TRUNK-3896(cherry picked from commit dfa7532)

Plugging in dependency on javax.validation api JSR-303 definition.

(cherry picked from commit 11ba110)

(cherry picked from commit 1171746)

(cherry picked from commit dd5368c)

… beans

(cherry picked from commit 9026fc5)

(cherry picked from commit 179d541)

valueCoded - TRUNK-4164

org.openmrs.validator.UserValidator.validate - TRUNK-4199

environment - TRUNK-4183

TRUNK-4156-redesign. Introduce care_setting table
1. Introduce new care_setting table.
2. Replace existing care_setting varchar to care_setting_id referencing the care_setting table.
3. Make OUTPATIENT as default care_setting for existing orders that do not have a care_setting.
4. Introduce new method in OrderService. This fixes a test and provides a way to retrieve a care setting.

Minor documentation fix

TRUNK-4156 - Changes based on comments.

Made some changes as a follow up in update file - TRUNK-4156

Fixed test data, order and caresetting hbm files - TRUNK-4156

Added the DrugReferenceMap class and its hibernate mapping XML file. - TRUNK-4143

Updated the Drug.java and Drug.hbm.xml to include references to the new DrugReferenceMap class. - TRUNK-4143

Fixed issues in liquibase-schema-only.xml. - TRUNK-4143

Added addDrugReferenceMap method to Drug.java. Minor code fixes and improvements to Drug.java. - TRUNK-4143

Minor improvements to Drug.hbm.xml. Changed serialVersionUuid in DrugReferenceMap.java to conform to convention. - TRUNK-4143

Code and documentation improvemment to the addDrugReferenceMap method of the Drug.java class. - TRUNK-4143

Moved the changeset to create the drug_reference_map table from liquibase-schema-only.xml to liquibase-update-to-latest.xml. - TRUNK-4143

Follow up due to bad conflict resolution - TRUNK-4143

(cherry picked from commit 38120f1)

…to concepts - TRUNK-4187

Applying auto format changes - TRUNK-4187

… utility method that fetches unique non null values in a given column and a table

class - TRUNK-4156

…ull constraint is added after setting order numbers for existing orders

Fixed making orders.order_number nullable

… table

liquibase changesets

TRUNK-4135 Post review fixes

TRUNK-4135 Changed to generate order frequency uuids from concept uuids

TRUNK-4135 Removed unnecessary call to check changelog

…ue assignments

Follow up to clean up more changesets

…ber column

Renamed the column drug_reference_map.map_type to drug_reference_map.concept_map_type.

Added equals() and toString() methods to api/src/main/java/org/openmrs/DrugReferenceMap.java.

Added DrugTest.java class.

Removed toString(), equals() and hashCode() methods fromDrugReferenceMap. Improved tests for the Drug class.

…a term and map type - TRUNK-4143

…continued orders

…um value names instead of a head coded enum value - TRUNK-4138