BAP-5555: CS fixes
BAP-5555: CS fixes

northdakota/platform,morontt/platform,Djamy/platform,northdakota/platform,2ndkauboy/platform,northdakota/platform,orocrm/platform,hugeval/platform,trustify/oroplatform,Djamy/platform,2ndkauboy/platform,orocrm/platform,ramunasd/platform,geoffroycochard/platform,ramunasd/platform,Djamy/platform,morontt/platform,2ndkauboy/platform,hugeval/platform,morontt/platform,trustify/oroplatform,trustify/oroplatform,orocrm/platform,geoffroycochard/platform,hugeval/platform,ramunasd/platform,geoffroycochard/platform