We were accidentally acquiring the deploy lock when acquire-lock failed.

Oops!  It's wrong to call _update_properties() when we don't have the
lock.

Auditors: chris

Test Plan:
Fingers crossed.