Added 'expiry' to lock, per sinfinatic's comment

I ended up keeping timestamp to represent the last time the lock was
changed, I think that's useful for the expected_values stuff in SDB's
writes.