Fixed locking of reservations based on time and ownership (1713)
Conflict bug fix on updating reservation.
(1083)