Merge "Allow Date methods for oscore cleanup job"