Add fix to hpc_server so it dies if manager dies