Merge "Disallow disabling of the package installer" into nyc-dev