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