PCP fixes

Integrate this to fix 2 PCP related bugs:
  - 2nd PCP MAP message deletes a mapping instead of refreshing lifetime
  - PCP MAP ignores upnp permissions