Merge "Split ES retention jobs for logs and notifications"