make ProjectLock reliable

@steved555 @pswadi-zendesk @jwswj @bolddane 

### Risks
 - None@s