Merge "Ensure server unlocking after test_lock_unlock_server"