Improve support for "long term locks"

Have "grab" requests return the expected release time, so that a polling
request for a lock can exit quickly if the lock won't be available
within the poll retry time.