Fixes the merging of one-to-one calls into conference calls.

git-svn-id: https://svn.java.net/svn/jitsi~svn/libjitsi@10420 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
All Metaswitch fixes to date