ECMS-5522 fix some violations in ECMS code base