Issue #2772005 by prince_zyxware, wellme, RenatoG, Sam152, frjo: Fix coding standards for the 7.x-2.x branch