ID 3614201 - Labs - Measurement links displaying wrong measurement types

Conflicts:

	src/main/java/oscar/oscarLab/ca/all/upload/ProviderLabRouting.java
ID: #2705 Partial Deletion of Alternate Week Schedules

https://sourceforge.net/p/oscarmcmaster/bugs/2705/
#2762 - Billing page accepts invalid data for billing items
Merge "ID: #2705 Partial Deletion of Alternate Week Schedules" into RELEASE_12_1