Go ahead and merge STUN mods for RTP in preparation for some STUN