Fix issue with exercise time limits being changed relatively to UTC time difference - refs #6884 refs BT#7165
Merge remote-tracking branch 'origin/1.9.x' into 1.9.x