pkg_upload: use __step instead of echo when done
Merge branch 'upload' into all