Merge "Drop odd parameters for package update job"