Backport PKG_USERS fixes.
Backport zsh build fix.
Change CONFLICTS to support our compat packages.