Merge "Fix TypeError in _unshelve_server"