Review main Merged

12497[TASK] Fix CGL violations against InlineControlStructure

Wouter Wolters CR +2 V +2 Hard +357 −131 updated 06/03/13, 20:49