Use UPSTREAM_BRANCH env vars in extra/build-package.sh