Close 4.11.7 - cmsContentXml fixes branch