upgrade-from: fix sourcing common by renaming BUILDDIR to ORIG
packages: fix wrong error reporting in disable_services_from_package and disable_service