am 6c59bc14: am 532a21e6: am 2c5b17df: P2P: Improve robustness against lost ctrl::ack

* commit '6c59bc140981a064431fc8555d78de7d539d9b0c':
  P2P: Improve robustness against lost ctrl::ack