Merge "Update PackageMonitor to recognize new 'replacing' semantics"