Merge pull request #259 from jaoo/1090103

Bug 1090103 - [Loop] FxOS Loop client needs to send channel in call setup messages. r=crdlc
(cherry picked from commit 04dd322b92ced6729c1d8ca729b7a0c05c4bbf68)