Merge pull request #19420 from clnperez/close-notify-fix

Move closeNotify to fix panic with newer golang