am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev

* commit 'aaaeb6a21bb6cc540fefa6868493bda612a63f22':
  DO NOT MERGE - Don't hang installs if the transport disappears