Revert "Only use cdata when "opting in" in xml conversion"

This reverts commit 54ad34601d170597770d12fd9479ef4cac8ff0b9.
Function was missing service locator variable
Fixed component aspects to use cdata only for text type components