reapply fixed which AppointmentStatuses are considered "cancelled"

Conflicts:
	api/src/test/java/org/openmrs/module/appointmentscheduling/api/TimeSlotServiceTest.java
Revert wrong merged conflicts
UHM-1172 Fix appointment tests resources