Issue #8409 and accidentally a fix to chan_sip that wasn't supposed to be there

but is still ok... Sorry. Lack of Tea, really.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65838 65c4cc65-6c06-0410-ace0-fbb531ad65f3