Fix catalog purge grace period.
Merge branch 'content-sources' into nodes-content-sources