Comment 5 for bug 1296937

I like this approach, and think it deals with all of the issues raised and any that I could think of.

I've cherry picked Evergreen commit 80ee141 to master, rel_2_5, and rel_2_6.

My intent was to push a revert of SIPServer commit c97d64412 to master, but I appear to lack the access to push to SIPServer. I'll work with someone to resolve that, then I think we're done with this bug.

Thanks Thomas, Ben, Galen, and Mike!