This changes also need to go into standalone-capedwarf-modules.xml and into CD_Testsuite project.