Fix failing unit tests on 1.10.x - TRUNK-4182
Revert "Fix failing unit tests on 1.10.x - TRUNK-4182"

This reverts commit 62d67594b61cc04c7536614101dc8feedeeb08b0.
Set the length for administrationInstructions to 65535 in the hbm file - TRUNK-4126
Merge remote-tracking branch 'upstream/1.10.x' into 1.10.x

Conflicts:
	api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml