Add missing foreign key constraint on order_type.parent column - TRUNK-4395
TRUNK-4389: Added DRUG_ORDER_TYPE_UUID & TEST_ORDER_TYPE_UUID constants to OrderType class,
Added unit test method saveOrder_shouldSetOrderTypeOfDrugOrderToDrugOrderIfNotSetAndConceptNotMapped to OrderServiceTest,
Added unit tests and code to set order type of drug/test order to drug/test order respectively if not set and concept not mapped in saveOrder() method
Back porting: MDS doesn't start and shows unfriendly error message after
installing - TRUNK-4019
deleted patientRegimen patientRegimenCurrent and patientRegimenCompleted jsp pages and DrugSetItem class

Conflicts:
	webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCompleted.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp
Fixed failing unit tests in Database1_9_7UpgradeTest
Blocking changesets when upgrading to 1.10 should direct to better explanations - TRUNK-4396
Converted the tinyurls to those generated on the openmrs wiki - TRUNK-4396
Support for prescribing brand medicines - TRUNK-4379

Conflicts:
	api/src/main/resources/liquibase-update-to-latest.xml
	api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
	api/src/test/resources/org/openmrs/include/standardTestDataset.xml

Updated files
Fixed length of DrugOrder.dispenseAsWritten field in the hbm file - TRUNK-4379
Patient dashboard issue when using french locale - TRUNK-4251(cherry picked from commit c4e351cd2f1b24951e93d0ee7bfe73cf5768a8db)
(cherry picked from commit d69695e86c12acf889b61bbbf823fecdf4ab3733)
TRUNK-4403 Blank drug order frequencies and dosing units should be converted to null during upgrade

(cherry picked from commit 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)

Conflicts:
	api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java

(cherry picked from commit 6460c0283b1758501c0a8ce5d53567c52eeefaba)
Upgrade to 1.10 fails if there are orders with orderers that have no provider accounts - TRUNK-4402

Conflicts:
	api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java

Follow up to fix liquibase changeset comment - TRUNK-4402

Follow up - TRUNK-4402

Conflicts:
	api/src/main/resources/liquibase-update-to-latest.xml
Fixed failing unit test
Add a setDosing method to DrugOrder that takes a DosingInstruction type TRUNK-4388

Applied auto format changes - TRUNK-4388
Hibernate queries in HibernatePatientSetDAO should use new order entry fields TRUNK-4407

Conflicts:
	api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java

Follow up to clean up code - TRUNK-4407
Upgrade should fail if there are discontinued orders with null discontinued_date or discontinued_by values - TRUNK-4401
Rename view privileges in OrderService TRUNK-4400

Follow up to rename VIEW privileges for order frequency and care setting to GET - TRUNK-4400

Follow up to add missing privileges and fix invalid ones - TRUNK-4400

Conflicts:
	api/src/main/java/org/openmrs/api/ConceptService.java
Applying auto format changes
Follow up to rename the actual privilege names to match the constant names - TRUNK-4400
Changed upgrade scripts to look up unknown provider by a global property and not name, also added ProviderService.getUnknownProvider - TRUNK-4402

Conflicts:
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
	api/src/main/resources/liquibase-update-to-latest.xml