Merge pull request #4207 from sigurdm/merge-cherry_pick_binstub_fix

Merge cherry pick of "Fix package name when refreshing binstubs" (#4205)