UHM-1050 Addition of parameter appointment type to  scheduled appointment blocks resource
UHM-1050 Update service to get scheduled appointments to filter by service type
Fix conflict merge