Plug heartbeat sender leak in clean_up_on_shutdown
Update change log