#1141 - Adds more robust error handling in order lock release, lock time-to-live behavior and tying locks to a specific container behavior
(cherry picked from commit a026b4c)