Merge "Integrate Rescue Party with Package Watchdog"