Fix dead-lock caused by re-entrant lock acquisition over put_diff RPC: fixes #723