CMS-2865 Remove usage of ContentResource find