Issue #2765259 by Yogesh Pawar, Ramdas Gaikar, naveenvalecha, navneet0693: Coding Standard fixes - Round 2