Remove **kwargs from pkg.upgrade functions

Fixes #14976