pkg/kamailio/(centos|fedora): updated ver in .spec
rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv
(cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6)
core: try to detect ipv6 addresses only when USE_IPV6 is used

- reported by Juha Heinanen
(cherry picked from commit b035aa9f2cc19d387b1b8f33a7888ffee27a4138)
parser: safety check for max port length in URI

- can't be longer than 5, a port being 16b value
- reported by Kevin Wojtysiak
(cherry picked from commit 13fd48f89555f5421e8285669e303bcefe44f149)
rr: use port.len to check for buffer overflow instead of max port len

    - reported by Kevin Wojtysiak
    (from commit 28a8b87885e373bee8cc81985277ae718973fdfd)
modules/presence_xml: fixed issue with parsing some pres-rules documents

- pres-rules that contain external links in a <conditions /> node don't
  have to have <identity /> nodes in the <conditions /> node.
- Kamailio returns an error when it finds a <conditions /> node with
  no <identity /> node inside it.
- Kamailio doesn't support external links, but it should skip over
  the <conditions /> nodes that contain them rather than return
  an error as later <conditions /> nodes may contain entries it can
  work with.
(cherry picked from commit ac99219b0a850e0305eaf661b028536cfc28e2cb)
topoh: safety check for SIP messages

- received callback can be executed for non-sip messages
- reported by Julia
(cherry picked from commit 352a7dccf2570af857d7e2e50fed600c4762278d)
(cherry picked from commit 533f2238d9d14ed8ef0a367ce574aef8052c0452)
Merge branch '3.3' of git://git.sip-router.org/sip-router into flowroute-3.3

Conflicts:
	modules/json
	modules/jsonrpc-c