Merge "Improve PackageWatchdogTest#raiseFatalFailure"