CMS-2088 Break up ContentResource.list into two methods