PLF-5224: Update the order of upgrade plugins