Merge "Fix SIP bug of different transport/port used for requests." into gingerbread