Fixes #5840 Improves stun baton messages

I deleted #5843 by accident; it was conflicting anyway and this is an improved pr.