NXP-10793: fix escaping of content view render id , fixing funkload tests
Merge branch 'master' into feature-NXROADMAP-127-DAM2