Conflicts: modules/xmpp/JingleSessionPC.js modules/xmpp/LocalSSRCReplacement.js modules/xmpp/TraceablePeerConnection.js