am 4794d8f3: reconcile with gingerbread

* commit '4794d8f3a9318e063cd08501ddf66fa767af0c19':
  Max-Forwards is actually optional.
  Only add maddr to the uri when it is different from the host.