Pernod Ricard has resolved strike action at one of its Scottish distilleries after agreeing to improved pay conditions.