BAP-3839: CS fixes
BAP-3839: CS fixes

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