(maint) Fix parent provider for package_mask
Merge branch 'master' into 2.x