Merge "Adding synchronous behaviour to the calendar REST API to wait until intent is in parked state. Needs testing."