Issue #1937930 by DYdave, gaofengzzz: Back-port from 7.x-2.x of fixes to coding standards, according to PAReview reported errors.