CMS-3640 Reduce usage of api.content.page.ComponentPath to the absolute minimum.
Removed some more uses.