Merge "Persisted jobs versus incorrect boot-time RTC" into oc-mr1-dev