Support both ATOMIC_PACKAGE_REPOSITORY being off/on