Properly merge existing reservation data in the calendar

This allows us to update existing reservation in the calendar with e.g.
a boarding pass, even if the new data is significantly less complete.