Merge "bugfix: kill the stunnel when cleanup"