Story 45135053: Changed logic for adding newly created controls on mapping page to rcontrols or ccontrols list, because directive/program split broke old system