Merged in jingle-reply-with-senders-both (pull request #635)

jingle: always reply with senders set to both

Approved-by: Gary Kramlich
Approved-by: John Bailey
Approved-by: Eion Robb