Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev