Merge "SIP: add SipErrorCode for error feedback." into gingerbread