Merge "Revert "Fix priority parameters for VIP instances""