Merge "Enforce multipackage installs have consistent rollback params"