Issue #3343452 by pratik, Eduardo Morales Alberti, urvashi_vora: Fix coding standards on branch 3.x before an official release