Merge compile+package. Remove server-upgrade.