Aligned with coding conventions
PLAT-1749
Merge pull request #1699 from kaltura/IX-9.19.3-PLAT-1749-Cosmetics

Aligned with coding conventions