Issue #3025123 by quietone, Safallia Joseph, tbradbury, alexpott, RoshniPatel.addweb: Fix code standards issues