Adjusted to prevent clash with PP0 services running on top of longerons.
Passes RunUpgradeTests with -s option.