Revert "A few formatting changes made by the autoformatter..."

This reverts commit 8560389ac9e5cfee5495036078b4331ff4c28e5e.

Conflicts:
	api/src/main/java/org/openmrs/api/OrderService.java
Revert "Add @since 1.10 to OrderService methods - TRUNK-3503"

This reverts commit df653a2908fb1950fd9393dffc7e75a63d730f02.
Revert "Added readonly transactional and privilege checks to OrderService"

This reverts commit e4172b74bc397123cf55ca613a781b91c631b85f.

Conflicts:
	api/src/main/java/org/openmrs/api/OrderService.java
Revert "Merging order-entry branch to trunk rev:28043"

This reverts commit f1ff17ad989a327f5e4abddeaba553821cd23bd3.

Conflicts:
	api/src/test/java/org/openmrs/api/OrderServiceTest.java
	api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
	api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml
Fixed missed code when resolving conflicts for previous reverts