Fixes issues after rebase

modules/xmpp/JingleSessionPC.js

 JingleSessionPC.prototype.replaceTransport = function (jingleOfferElem,
                                                        success,
                                                        failure) {
-    
+
     // We need to first set an offer without the 'data' section to have the SCTP
     // stack cleaned up. After that the original offer is set to have the SCTP
     // connection established with the new bridge.
     }
 
     if(this.jingleOfferIq) {
-        fromSessionInitiate = true;
         sdp = new SDP('');
         if (this.webrtcIceTcpDisable) {
             sdp.removeTcpCandidates = true;
            logger.error(errmsg, err);
         } else {
            logger.error(errmsg);
-           err = errmsg; // for queueCallback
+           err = new Error(errmsg); // for queueCallback
         }
         GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
         queueCallback(err);
                             undefined,
                             "modified setLocalDescription failed")
                     );
-                },
-                reportError.bind(undefined, "modified answer failed")
+                }, reportError.bind(undefined, "modified answer failed"),
+                media_constraints
             );
         },
         reportError.bind(undefined, 'modify failed')