Did you select upgrade groups with package feature?
if then you need to select the option maintain the existing feature set; this would install what you had earlier
seems like u selected all the packages hence it installed application and device control also.