am 31aa0772: am 7a4e519e: am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev

* commit '31aa077226b8d9d65d351ddb92a01273d9830070':
  Update PackageMonitor to recognize new 'replacing' semantics