Merging in changes (r5526): #24063: Can specify delta years/months/weeks/days/hours/minutes/seconds in date rule.
Merging in changes (r5526): #24063: Can specify delta years/months/weeks/days/hours/minutes/seconds in date rule.

haakonsk/O2-Framework,haakonsk/O2-Framework,haakonsk/O2-Framework,haakonsk/O2-Framework