#3228 GDML labs are improperly parsed 
https://sourceforge.net/p/oscarmcmaster/bugs/3228/

Change-Id: Id840e6db8905295f9e5e1481361d0dbfedd8fc20
#2788 Deleting a Service Loses Service and Consultant for Previously
Created Consults
https://sourceforge.net/p/oscarmcmaster/bugs/2788/

Change-Id: I5abe9619ff46f81e8bdb602fe74adc4ecc525261
Bug#3260 Intermittent bug causes appointment statuses to be set to ""

- Fixed a related code error (CaseManagementEntryAction.java:616)
- The bug occurs only occasionally and cannot be readily reproduced,
  so we changed code to let the system log and skip update when appointment status is invalid.
  The log can be used to further trace the error if it happens again.
Bug#3274 Scheduled Timer fail when enabling multiple modules
(Cherry-picked from master branch)

fixed by giving each scheduler a different bean id

Change-Id: I748c53b07408a0105989d6ab2c0d34a0aa8a51a3

Conflicts:

	src/main/resources/applicationContextCBI.xml
	src/main/resources/applicationContextORN.xml
Merge "Bug#3274 Scheduled Timer fail when enabling multiple modules (Cherry-picked from master branch)" into RELEASE_12_1
#3278 RTL "please call an administrator" error when fax not wanted 

Move the not helpful or wanted alert to console

Change-Id: Ia809f5c98bdbce1d5e5e2063a34bcbdad538f328
Merge "#3228 GDML labs are improperly parsed  https://sourceforge.net/p/oscarmcmaster/bugs/3228/" into RELEASE_12_1
Merge "#2788 Deleting a Service Loses Service and Consultant for Previously Created Consults https://sourceforge.net/p/oscarmcmaster/bugs/2788/" into RELEASE_12_1
Merge "#3278 RTL "please call an administrator" error when fax not wanted " into RELEASE_12_1